Commit Graph

9 Commits

Author SHA1 Message Date
zilongshanren 6d0fc9dcbf fix videoplayer crash issue 2017-01-18 18:16:19 +08:00
zilongshanren be642ec1af add ready to play event 2016-10-17 11:59:38 +08:00
pandamicro 2763b53ac1 Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop
Conflicts:
	cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoHelper.java
2016-08-26 19:11:51 +08:00
zilongshanren ca1a3d8870 fix android isPlaying API 2016-08-16 14:49:48 +08:00
zilongshanren c6ee3598d3 add android support 2016-08-16 12:01:23 +08:00
pandamicro 5011a758cc Upgrade cocos/ui to v3.13 2016-08-07 22:18:28 +08:00
Wenhai Lin 850c479516 Sync Bug fix:
1. HttpClient: remove Content-Type limitation
2.VideoPlayer/WebView: hide system native control when the Node leaves the 'stage'
2016-05-12 14:26:28 +08:00
Wenhai Lin 94c95d5838 Withespaces does matter. 2016-03-31 23:50:02 +08:00
Wenhai Lin a6dbf31dcf cocos 2d lite version 2016-03-29 17:55:48 +08:00