James Chen
|
ea08d2f9bc
|
Safe check of _stencil variable in CCClippingNode.cpp.
|
2017-10-24 11:03:27 +08:00 |
|
James Chen
|
ab4299c77c
|
Fixes after merging develop.
|
2017-08-28 15:03:02 +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 |
|
2youyouo2
|
469f9a9ab8
|
fixed mask in camera
|
2017-08-03 14:39:43 +08:00 |
|
James Chen
|
ad648e7236
|
Removes old 3d code.
|
2017-07-31 16:01:38 +08:00 |
|
knoxHuang
|
4226ad9416
|
should check validation of _stencil
|
2016-11-28 15:57:28 +08:00 |
|
knoxHuang
|
346d6505f5
|
reset stencil program when alpha threshold is set to 1
|
2016-11-24 17:41:52 +08:00 |
|
pandamicro
|
8642f8ef74
|
Upgrade cocos/2d to v3.13
|
2016-08-04 11:59:26 +08:00 |
|
minggo
|
5f442985d3
|
fix ClippingNode not cleaning up _stencil correctly
|
2016-07-18 16:24:11 +08:00 |
|
Wenhai Lin
|
5159d14367
|
Bug fix
|
2016-04-28 23:37:21 +08:00 |
|
Wenhai Lin
|
94c95d5838
|
Withespaces does matter.
|
2016-03-31 23:50:02 +08:00 |
|
Wenhai Lin
|
a6dbf31dcf
|
cocos 2d lite version
|
2016-03-29 17:55:48 +08:00 |
|