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
f8b9f8134c
bug fixs from #959 but except changes in CCSpriteBatchNode.cpp. ( #991 )
...
* bug fixs
* Reverts changes in CCSpriteBatchNode.cpp
2017-11-16 14:00:11 +08:00
James Chen
94840bb5c2
Fixes potential crash in eventDispatcher.removeListener(listener). ( #982 )
...
It may invoke `releaseListener` two times if it's dispatching event. `releaseListener` will call releaseScriptObject internally which may cause the `listener` being garbage collected.
It's hard to reproduce this issue in v1.6 since v1.6 uses SpiderMonkey as its JS engine which is not sensitive to do a GC operation.
2017-11-14 14:50:05 +08:00
yinkaile
169a60b157
refine code
2017-11-01 11:36:55 +08:00
yinkaile
879c6488a5
refine code
2017-11-01 10:55:14 +08:00
yinkaile
fd73955d10
fixed MatrixStack::pop
2017-11-01 09:35:03 +08:00
yinkaile
d7fa1f9e13
rename director culling functions
2017-10-31 18:23:13 +08:00
yinkaile
40432bda34
add MatrixStack class
2017-10-31 18:14:11 +08:00
yinkaile
26ff253d8c
support dynamic enable/disable culling
2017-10-31 15:37:12 +08:00
yinkaile
b784973426
optimize director matrix operation
2017-10-31 15:36:20 +08:00
pandamicro
ace6e0bee3
Merge pull request #871 from pandamicro/develop
...
Add CC_FIX_ARTIFACTS_BY_STRECHING_TEXEL_TMX to control texture shrink…
2017-10-01 20:49:47 +08:00
pandamicro
18350c5451
Add CC_FIX_ARTIFACTS_BY_STRECHING_TEXEL_TMX to control texture shrink in tiled map
2017-09-30 12:54:48 +08:00
James Chen
ede0182d21
Sync projection bug fix from cocos2d-x pull/17487
2017-09-27 16:06:27 +08:00
James Chen
24efeae53d
Merge pull request #846 from jareguo/develop
...
load image for existing texture
2017-09-26 01:59:32 -05:00
James Chen
5c5a0a257a
Adds CCThreadPool.cpp/.h to vs project.
2017-09-26 14:34:22 +08:00
James Chen
22a4f8da15
Warning fix in CCConsole and dragonbones.
2017-09-26 11:16:20 +08:00
Jare Guo
21011d38d9
Merge commit 'ee808929a67ee7ad3b38f135cb2a67b8e32c89eb' into develop
2017-09-26 11:04:56 +08:00
Jare Guo
1ea2fc1715
revert TextureCache, use ThreadPool instead
2017-09-26 10:18:01 +08:00
James Chen
c7089bfa86
Image refactor
2017-09-26 04:57:49 +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
056ac35aac
Removes unused ScriptEngineProtocol invocation in CCRef.cpp.
2017-08-31 14:24:34 +08:00
James Chen
592567da57
Potential GC problem fix in CCDirector.cpp.
2017-08-30 14:02:57 +08:00
pandamicro
9ebcbe0d53
Refactor ScriptingCore::removeObjectProxy
2017-08-29 17:39:24 +08:00
James Chen
99c1b24256
Merge branch 'develop' into jsb2.0
2017-08-28 14:38:47 +08:00
James Chen
621ff28b4a
Merge branch 'v1.6' into develop
...
# Conflicts:
# cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js
# 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_experimental_webView_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_webView_auto.hpp
# cocos/scripting/js-bindings/manual/BaseJSAction.cpp
# cocos/scripting/js-bindings/manual/BaseJSAction.h
# cocos/scripting/js-bindings/manual/ScriptingCore.cpp
# cocos/scripting/js-bindings/manual/ScriptingCore.h
# cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
# cocos/scripting/js-bindings/manual/cocos2d_specifics.hpp
# cocos/scripting/js-bindings/manual/js_manual_conversions.cpp
# cocos/scripting/js-bindings/manual/network/XMLHTTPRequest.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/ios/JavaScriptObjCBridge.mm
# cocos/scripting/js-bindings/manual/spidermonkey_specifics.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_debugger.js
# extensions/anysdk/js-bindings/SDKManager.cpp
# extensions/anysdk/js-bindings/manualanysdkbindings.cpp
# templates/cocos2dx_files.json
# templates/js-template-binary/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm
# templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm
# templates/js-template-link/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm
# tools/tojs/cocos2dx.ini
# tools/tojs/cocos2dx_experimental_webView.ini
2017-08-28 14:23:30 +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
pandamicro
80dac85639
Fix network crashing issue during restart
2017-08-07 18:30:51 +08:00
James Chen
ad648e7236
Removes old 3d code.
2017-07-31 16:01:38 +08:00
James Chen
f74bfa9a5c
Removes old 3d code.
2017-07-31 16:00:26 +08:00
James Chen
b97be2db09
Event's subclass should not be allocated on stack.
2017-07-24 11:47:49 +08:00
James Chen
98301a8cc4
Ref class should not be allocated on stack.
2017-07-21 17:21:26 +08:00
James Chen
94dde6ac0d
Ref class should not be allocated on stack.
2017-07-21 16:21:48 +08:00
pandamicro
bd6c45abf2
Fix reverted modifications during merge
2017-07-20 15:22:52 +08:00
pandamicro
211c50b6f5
Fix event dispatching issue (old value stay in event obj)
2017-06-30 18:02:04 +08:00
pandamicro
27536dad4c
Fix critical issues in bindings code
2017-06-30 18:02:01 +08:00
James Chen
91359f1f75
first commit
2017-06-15 17:24:30 +08:00
knoxHuang
c962ec5f98
remove superfluous code in CCEventDispatcher
2017-06-01 13:40:38 +08:00
knoxHuang
af9d7fc0bc
fix CCSystemEvent bug for fireball/issues/5821
2017-06-01 09:47:34 +08:00
James Chen
6c4b055371
remove unused checking
2017-05-19 11:10:30 +08:00
James Chen
a4e60ad6bb
fix pauseAllEventListenersForTarget couldn't work while dispatching touch event.
2017-05-19 11:10:25 +08:00
zilongshanren
47a97df552
fix: validates director before layout in iOS
2017-04-26 15:05:57 +08:00
Wang Nan
799fb4f19c
Merge pull request #594 from 2youyou2/android-studio
...
Android studio
2017-04-25 10:08:28 +08:00
pandamicro
7df074e172
Reverse pure JS Action, reuse JSB Action
2017-04-22 14:57:16 +08:00
2youyouo2
f1bffe9e4b
fixed android compile error with newest ndk-tool in binary template
2017-04-21 09:41:00 +08:00
pandamicro
201a2ba4e4
Compilation succeed after remove Action in native
2017-03-23 18:15:47 +08:00
pandamicro
f787cebfb9
Reuse js objects for jsb_get_or_create_weak_jsobject, reduce memory usage
2017-02-24 18:08:36 +08:00
zhangbin
8f9b57c1c7
Destroy the SkeletonBatch instance when the director is reset.
2017-01-06 15:21:30 +08:00
knoxHuang
0de43f6ba6
add const for getListeners
2016-12-09 14:50:28 +08:00
knoxHuang
86817f5d51
add hasEventListener for CCEventDispatcher
2016-12-07 13:48:36 +08:00