Commit Graph

165 Commits

Author SHA1 Message Date
James Chen 46ad6b1f38 Fixes ResizableBufferAdapter<Data>::resize doesn't consider the situation of new size which is lower than old size. (#1028) 2017-12-12 16:47:42 +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 44813f4166 Sync PR: cocos2d-x #18299: JNI ERROR (app bug): local reference table overflow (max=512) (#1024)
* Sync PR:  cocos2d-x #18299: JNI ERROR (app bug): local reference table overflow (max=512)

* Fixes potential memory leak if can't find class by jsb.reflection.callStaticMethod.
2017-12-08 18:25:04 +08:00
James Chen c22673d440 Provides an interface for getting SafeArea (#1008)
* Provides an interface for getting SafeArea

* @available(iOS 11.0, *) isn't supported in Xcode8. So we use the old way.
2017-11-23 13:39:35 +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 2c793ac5ba Android Studio 3.0 Support.
Depends on https://github.com/cocos-creator/cocos2d-console/pull/49
2017-10-30 11:28:34 +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
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 a314c520ff Merge pull request #854 from knoxHuang/develop
fix editorbox bug for fireball/issues/6408
2017-09-25 22:22:41 -05:00
knoxHuang 4e0d4f2711 fix editorbox bug for fireball/issues/6408 2017-09-26 10:52:42 +08:00
James Chen 3c67a5b9ca Adds delete keyword for nonmoveable and noncopyable constructor and assignment. 2017-09-26 10:36:53 +08:00
James Chen c7089bfa86 Image refactor 2017-09-26 04:57:49 +08:00
James Chen 8230176ccb Fixes crash while click restart button in network test. (#829)
* Sync PR(https://github.com/cocos2d/cocos2d-x/pull/17921): remove "system" usage which is removed from iOS11.

* Fixes crash while click `restart` button in network test.

* printf -> LOGD

* Memory leak fix in XMLHttpRequest binding code.
2017-09-20 01:48:15 -05: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 53e07c1da7 Merge branch 'v1.6' of git://github.com/cocos-creator/cocos2d-x-lite into jsb2.0 2017-09-07 18:32:24 +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
James Chen 3d5b98b8a0 Refactor the order of class (Node, Label, Sprite) member for saving more memory.
More enum of char elements for saving more memory.
EventTouch and EventMouse are cached.
releaseScriptObject for scene should be placed at setNextScene.
Fixes protential crash while gc comes for JSC and ChakraCore.
Adds assertion in ScriptingCore::releaseScriptObject for not being invoked while gc.
Scheduler binding fix.
2017-08-28 14:03:33 +08:00
James Chen 7653cb453f Merge branch 'develop' of git://github.com/cocos-creator/cocos2d-x-lite into jsb2.0
# Conflicts:
#	build/cocos2d_libs.xcodeproj/project.pbxproj
#	cocos/2d/libcocos2d.vcxproj.filters
#	cocos/Android.mk
#	cocos/editor-support/creator/CCCameraNode.cpp
#	cocos/editor-support/creator/physics/CCPhysicsAABBQueryCallback.cpp
#	cocos/editor-support/creator/physics/CCPhysicsAABBQueryCallback.h
#	cocos/network/SocketIO.cpp
#	cocos/network/WebSocket-libwebsockets.cpp
#	cocos/renderer/CCTextureCache.cpp
#	cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js
#	cocos/scripting/js-bindings/auto/jsb_box2d_auto.cpp
#	cocos/scripting/js-bindings/auto/jsb_box2d_auto.hpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_audioengine_auto.cpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_audioengine_auto.hpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_dragonbones_auto.cpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_dragonbones_auto.hpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_video_auto.cpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_video_auto.hpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_webView_auto.cpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_webView_auto.hpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_extension_auto.cpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_extension_auto.hpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_network_auto.cpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_network_auto.hpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.cpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.hpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.cpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.hpp
#	cocos/scripting/js-bindings/auto/jsb_creator_auto.cpp
#	cocos/scripting/js-bindings/auto/jsb_creator_auto.hpp
#	cocos/scripting/js-bindings/manual/JavaScriptJavaBridge.h
#	cocos/scripting/js-bindings/manual/JavaScriptObjCBridge.h
#	cocos/scripting/js-bindings/manual/ScriptingCore.cpp
#	cocos/scripting/js-bindings/manual/ScriptingCore.h
#	cocos/scripting/js-bindings/manual/box2d/js_bindings_box2d_manual.cpp
#	cocos/scripting/js-bindings/manual/box2d/js_bindings_box2d_manual.h
#	cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
#	cocos/scripting/js-bindings/manual/cocos2d_specifics.hpp
#	cocos/scripting/js-bindings/manual/creator/js_bindings_creator_manual.cpp
#	cocos/scripting/js-bindings/manual/dragonbones/jsb_cocos2dx_dragonbones_manual.cpp
#	cocos/scripting/js-bindings/manual/dragonbones/jsb_cocos2dx_dragonbones_manual.h
#	cocos/scripting/js-bindings/manual/experimental/jsb_cocos2dx_experimental_video_manual.cpp
#	cocos/scripting/js-bindings/manual/experimental/jsb_cocos2dx_experimental_webView_manual.cpp
#	cocos/scripting/js-bindings/manual/extension/jsb_cocos2dx_extension_manual.cpp
#	cocos/scripting/js-bindings/manual/js_bindings_config.h
#	cocos/scripting/js-bindings/manual/js_bindings_opengl.cpp
#	cocos/scripting/js-bindings/manual/js_manual_conversions.cpp
#	cocos/scripting/js-bindings/manual/js_manual_conversions.h
#	cocos/scripting/js-bindings/manual/js_module_register.cpp
#	cocos/scripting/js-bindings/manual/js_module_register.h
#	cocos/scripting/js-bindings/manual/jsb_event_dispatcher_manual.cpp
#	cocos/scripting/js-bindings/manual/jsb_event_dispatcher_manual.h
#	cocos/scripting/js-bindings/manual/jsb_helper.h
#	cocos/scripting/js-bindings/manual/jsb_opengl_functions.cpp
#	cocos/scripting/js-bindings/manual/jsb_opengl_functions.h
#	cocos/scripting/js-bindings/manual/jsb_opengl_manual.cpp
#	cocos/scripting/js-bindings/manual/jsb_opengl_manual.h
#	cocos/scripting/js-bindings/manual/jsb_opengl_registration.cpp
#	cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_functions.cpp
#	cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_functions.h
#	cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_registration.cpp
#	cocos/scripting/js-bindings/manual/network/XMLHTTPRequest.cpp
#	cocos/scripting/js-bindings/manual/network/js_network_manual.cpp
#	cocos/scripting/js-bindings/manual/network/js_network_manual.h
#	cocos/scripting/js-bindings/manual/network/jsb_socketio.cpp
#	cocos/scripting/js-bindings/manual/network/jsb_websocket.cpp
#	cocos/scripting/js-bindings/manual/platform/android/CCJavascriptJavaBridge.cpp
#	cocos/scripting/js-bindings/manual/platform/android/CCJavascriptJavaBridge.h
#	cocos/scripting/js-bindings/manual/platform/ios/JavaScriptObjCBridge.h
#	cocos/scripting/js-bindings/manual/platform/ios/JavaScriptObjCBridge.mm
#	cocos/scripting/js-bindings/manual/spidermonkey_specifics.h
#	cocos/scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.cpp
#	cocos/scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.h
#	cocos/scripting/js-bindings/manual/ui/jsb_cocos2dx_ui_manual.cpp
#	cocos/scripting/js-bindings/proj.android/Android.mk
#	cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj
#	cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj
#	cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj.filters
#	cocos/scripting/js-bindings/script/jsb_boot.js
#	tools/bindings-generator
#	tools/tojs/cocos2dx.ini
#	tools/tojs/genbindings.py
2017-08-10 18:04:24 +08:00
James Chen 2f8bc2529e Event class should be new ed. 2017-08-10 16:56:03 +08:00
James Chen 5656b8ec77 update line ending format for CCApplication-win32.cpp 2017-08-10 09:36:57 +08:00
James Chen e86ed76abf jsb2.0 windows works on v8. 2017-08-09 18:06:33 +08:00
James Chen 64a6d89b19 cleanup 2017-07-25 10:14:32 +08:00
James Chen b97be2db09 Event's subclass should not be allocated on stack. 2017-07-24 11:47:49 +08:00
James Chen a3195fe6f5 memory leak fix. 2017-07-21 11:14:13 +08:00
pandamicro 27d681a1a8 Upgrade to Spidermonkey v52. pass 3: Compilation pass 2017-06-30 18:01:54 +08:00
James Chen cb9d9c2ad4 updates 2017-06-21 13:42:25 +08:00
James Chen 259bbbd6b2 updates. 2017-06-16 16:32:24 +08:00
zilongshanren 3f1b33258c improve system label wrap option 2017-05-22 17:14:28 +08:00
pandamicro 5394abb9bf Support multi touch on iOS (the correct way) 2017-05-18 14:28:03 +08:00
pandamicro 5b721d51b2 Support multi touch on iOS 2017-05-18 11:36:49 +08:00
zilongshanren dba7eb0d8d refine code 2017-05-15 17:36:45 +08:00
zilongshanren d727e2657f fix windows system label overflow 2017-05-15 17:28: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
zilongshanren 47a97df552 fix: validates director before layout in iOS 2017-04-26 15:05:57 +08:00
Wang Nan 77c4b7b9be Merge pull request #600 from dumganhar/fix/sync-v3
Sync with cocos2d-x v3 branch ddb4dc8 commit.
2017-04-25 10:28:55 +08:00
Wang Nan 799fb4f19c Merge pull request #594 from 2youyou2/android-studio
Android studio
2017-04-25 10:08:28 +08:00
James Chen fc98b4bdc0 Sync with cocos2d-x v3 branch ddb4dc8 commit. 2017-04-24 10:49:02 +08:00
zilongshanren 60587b4e9d fix ios label shrink bug 2017-04-21 13:53:39 +08:00
2youyouo2 1f7545af2b android-studio 2017-04-19 18:21:29 +08:00
zhangbin 79f1705ed1 Solve the error when parameter of FileUtils:: fullPathForFilename contains ".." 2017-02-23 16:53:14 +08:00
pandamicro d6683e9376 Fix compilation issues on win32 2017-01-24 15:26:24 +08:00