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
James Chen
ede0182d21
Sync projection bug fix from cocos2d-x pull/17487
2017-09-27 16:06:27 +08:00
James Chen
592567da57
Potential GC problem fix in CCDirector.cpp.
2017-08-30 14:02:57 +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
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
b97be2db09
Event's subclass should not be allocated on stack.
2017-07-24 11:47:49 +08:00
zilongshanren
47a97df552
fix: validates director before layout in iOS
2017-04-26 15:05:57 +08:00
zhangbin
8f9b57c1c7
Destroy the SkeletonBatch instance when the director is reset.
2017-01-06 15:21:30 +08:00
pandamicro
2971980c03
Upgrade cocos/base to v3.13
2016-08-04 16:04:41 +08:00
Wenhai Lin
d89029f441
Fixed FPS
2016-05-12 17:21:32 +08:00
Wenhai Lin
4eadc94cbc
Fixed crash in Director::popScene()
2016-05-11 13:52:10 +08:00
Wenhai Lin
194fa85b7e
stability improvements
2016-05-10 22:48:00 +08:00
Wenhai Lin
cab4a05112
Fixed crash
2016-05-10 18:37:24 +08:00
Wenhai Lin
cf40056acd
Fixed crash on desktop
2016-05-10 18:32:27 +08:00
Wenhai Lin
94501cc8f1
Bug fix and stability improvements
2016-04-25 15:56:03 +08:00
Wenhai Lin
83fc6fd1a8
Bug fix:
...
1.Fixed crash in win for rich text
2.Fixed crash when custom SSL certificate is set on iOS
3.Fixed SocketIO crash on reconnect
4.Fixed ActionManager memory leak
5.Fixed crash in MenuItem::activate
6.Fixed crash on exit game
7.Fixed crash in TableView::updateCellAtIndex
8.Fixed crash in RichText on window
2016-04-21 15:19:47 +08:00
Wenhai Lin
efc97073e3
Fixed memory leak
2016-04-18 11:06:14 +08:00
Wenhai Lin
4099c18dc3
Fixed crash on win32\mac
2016-04-15 10:25:32 +08:00
Wenhai Lin
ec1a1d65b7
Remove unnecessary 'void' modifier
2016-04-07 23:13:19 +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