Commit Graph

61 Commits

Author SHA1 Message Date
Jare Guo db13242bde Merge v1.6 into v1.8
# Conflicts:
#	cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
2018-01-18 17:48:35 +08:00
Knox 1b0965803c fix CocosAnalytics issue for fireball/issues/6730 (#1058) 2018-01-16 18:30:13 +08:00
James Chen 0cfbfd08f7 Kill process if Cocos2dxActivity.onDestroy is invoked to resolve crash if app goes to background for a long time and Activity is recycled by system. (#1027) 2017-12-12 11:10:51 +08:00
James Chen 2b463b2b84 Updates libcocosanalytics.jar 2017-11-07 16:05:22 +08:00
James Chen 6a8106c5f3 Updates Cocos Analytics relevant code.
Adds missing onPause, onResume, onDestroy invocation.
Disabled local debug by default.
Uses AnySDK channel ID in APK or IPA file if channel ID isn't found.
2017-11-03 15:19:03 +08:00
James Chen 873cb81a27 Adds missing file CAAgentWrapper.java (#933) 2017-10-26 10:05:08 +08:00
James Chen 4c8e57762b Adds jsb bindings of Cocos analytics for iOS and adds missing libcocosanalytics.jar. 2017-10-19 17:39:24 +08:00
knoxHuang 2027d2f752 fix fireball/issues/6475 2017-10-18 17:13:54 +08:00
James Chen ae8dc9ce35 Safer code in Cocos2dxHttpURLConnection.java 2017-10-12 15:05:52 +08:00
knoxHuang 3b3f80712e fix editorBox setText error for engine/issues/1961 2017-09-26 15:00:50 +08:00
James Chen f19fb0b1f8 [android] Fixes AppAcitivity (Sub class of Cocos2dxActivity) is re-created which causes crash if launching app first time and re-opening from icon. 2017-09-15 10:41:32 +08:00
James Chen 642250694e [android] Fixes Cocos2dxActivity is re-created which causes crash if launching app first time and re-opening from icon 2017-09-11 11:09:29 +08:00
James Chen 703e857352 Synchronize network changes from cocos2d-x. 2017-08-30 13:56:41 +08:00
pandamicro f17696d7dd Merge pull request #783 from pandamicro/v1.6
Fix crash caused by physics proxy management
2017-08-30 00:01:46 +08:00
pandamicro 4722594327 Remove mistaken error log 2017-08-29 17:52:16 +08:00
knoxHuang 4147b27e3b fix WebView bug for fireball/issues/6328 2017-08-29 17:19:28 +08:00
zilongshanren 811346cc58 fix invisiable issue 2017-05-10 17:34:27 +08:00
zilongshanren 1a6e0ed7c1 sync changes from cocos2d-x v3 2017-05-10 17:22:02 +08:00
zilongshanren fd72938523 fix editbox textchagned event call times on Android 2017-05-05 11:16:48 +08:00
zilongshanren 25bd7d7923 fix editbox duplicated text when change text in textChange callback 2017-05-03 15:03:21 +08:00
James Chen fc98b4bdc0 Sync with cocos2d-x v3 branch ddb4dc8 commit. 2017-04-24 10:49:02 +08:00
pandamicro 3eee19339a Fix download resuming issue on Android 2017-01-06 17:00:47 +08:00
zilongshanren c76bfb50fe fix label shrink effect infinit loop on Android 4.4.2 2016-12-28 14:49:17 +08:00
Nan Wang 9a934c8b46 Merge branch 'v1.3' of github.com:cocos-creator/cocos2d-x-lite into develop 2016-11-07 15:21:33 +08:00
James Chen 725aa66556 Updates lite audio engine sources from upstream (cocos2d-x). 2016-10-28 11:30:29 +08:00
zilongshanren be642ec1af add ready to play event 2016-10-17 11:59:38 +08:00
zilongshanren 65a677e51a improve VideoPlayer 2016-10-14 18:16:40 +08:00
zilongshanren 58be2ff238 add metaloaded and click event 2016-10-14 11:37:31 +08:00
zilongshanren 0b658267be fix textChange event 2016-09-05 17:01:38 +08:00
zilongshanren b2c56ff88a fix editbox issue 2016-09-05 16:48:45 +08:00
zilongshanren 727ac643b4 fix Android compile and running issues 2016-09-02 17:38:31 +08:00
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 66a38aa3a4 Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop
Conflicts:
	cocos/2d/CCFastTMXTiledMap.cpp
2016-08-26 20:48: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
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