Commit Graph

27 Commits

Author SHA1 Message Date
pandamicro fcbcce65d8 Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop
Conflicts:
	cocos/platform/android/CCDevice-android.cpp
	cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxBitmap.java
	cocos/platform/ios/CCDevice-ios.mm
	cocos/platform/mac/CCDevice-mac.mm
	cocos/platform/win32/CCDevice-win32.cpp
2016-08-31 14:39:08 +08:00
zilongshanren 81393c3ef4 add android bold support 2016-08-30 15:16:10 +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
pandamicro 1c01a9df2c Fix android compilation issuse 2016-08-26 19:01:13 +08:00
pandamicro 9bf561baee Upgrade to v3.13 release 2016-08-26 14:30:32 +08:00
zhangbin f97b23514b Use java reflection to avoid API level dependent, Use API Level 10. 2016-08-25 09:56:32 +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 fe85f150d9 Upgrade cocos/platform to v3.13 2016-08-05 18:13:48 +08:00
zhangbin 23636a25b0 Solve the error when compiling android with API Level 23. 2016-07-26 13:50:01 +08:00
zilongshanren 862e868666 add return key event 2016-07-19 16:42:54 +08:00
minggo 89406f4a3e Enable WebView's local storage on Android 2016-07-18 18:11:59 +08:00
zilongshanren e4f6f6db26 fix android multiline editbox alignment 2016-07-15 18:35:11 +08:00
zilongshanren fd7f421e9f fix Android EditBox textChange event 2016-07-15 14:16:51 +08:00
zilongshanren 0b69cec407 sync editbox changes from cocos2d-x 2016-06-24 17:33:58 +08:00
zilongshanren 6e5b266496 add all lowercase support 2016-06-24 15:30:59 +08:00
minggo 6a259592f4 hide virtual button by default 2016-06-16 10:31:00 +08:00
zilongshanren 0733fe707c fix template settings 2016-06-12 18:30:04 +08:00
zilongshanren c2e5a97f6a add system font label overflow 2016-06-12 17:43:02 +08:00
pandamicro dfbf560787 Add necessary Android dependencies for AssetsManager 2016-06-06 20:30:09 +08:00
James Chen ca2ae05042 typo fix: destoryAudioEngine -> destroyAudioEngine 2016-05-25 17:22:18 +08:00
Wenhai Lin 822966e820 Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into md 2016-04-19 10:05:02 +08:00
Wenhai Lin 19e9c085e0 Bug fix:1.Set music volume control as default 2.Fix calculation of base64Encode outLength 2016-04-18 23:49:35 +08:00
2youyouo2 e72b805fc9 fixed android local storage getItem 2016-04-12 10:31:40 +08:00
Wenhai Lin 94c95d5838 Withespaces does matter. 2016-03-31 23:50:02 +08:00
Wenhai Lin 8257556bc5 Fixed compile errors and warnings 2016-03-30 17:13:15 +08:00
Wenhai Lin a6dbf31dcf cocos 2d lite version 2016-03-29 17:55:48 +08:00