Commit Graph

41 Commits

Author SHA1 Message Date
James Chen e90d906ba3 Sync PR: fix CCTextureCache addImageAsync race condition
https://github.com/cocos2d/cocos2d-x/pull/18366
2017-11-07 15:48:56 +08:00
yinkaile 26ff253d8c support dynamic enable/disable culling 2017-10-31 15:37:12 +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 7fae7201d7 initWithImageFileThreadsafe -> initWithImageFile. 2017-09-26 09:55:00 +08:00
James Chen c7089bfa86 Image refactor 2017-09-26 04:57:49 +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 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
pandamicro 0a2689d4b6 Fix restart crash and reduce restart memory leak 2017-07-28 15:32:25 +08:00
James Chen 73c318d105 memory leak fix in CCTextureCache::addImageAsync. 2017-07-21 15:22:09 +08:00
2youyouo2 28da01c80b support camera culling 2017-06-09 18:33:40 +08:00
zilongshanren 3261623a74 add 2d culling back for scale9sprite and grahpics 2017-06-02 15:15:59 +08:00
zilongshanren 60f8d20c82 add opacity support to drawnode 2017-01-23 16:59:45 +08:00
zilongshanren d76dae6409 add label outline effect to mac 2016-12-30 18:08:13 +08:00
zilongshanren 1a34550c01 fix label font color issue 2016-10-22 09:33:47 +08:00
Nan Wang ef368ef409 merged v1.2 2016-09-07 18:47:59 +08:00
zilongshanren e8f195cf82 refactoring scale9sprite and fix gray scale shader 2016-09-07 14:52:50 +08:00
knoxHuang b73e97e403 add enableAntiAlias for Native for fireball/issues/2836 2016-08-29 16:33:52 +08:00
pandamicro 26117d82b3 Fix compilation issues on iOS 2016-08-26 18:52:25 +08:00
pandamicro 9bf561baee Upgrade to v3.13 release 2016-08-26 14:30:32 +08:00
pandamicro b742058510 Fix all compilation and linking issues 2016-08-16 16:09:39 +08:00
pandamicro 6713fd2d11 Fix js-bindings project compilation issues 2016-08-15 19:08:58 +08:00
pandamicro 1dd701936b Fix compilation issues on Mac 2016-08-11 13:57:51 +08:00
pandamicro ab95942886 Upgrade cocos/renderer to v3.13 2016-08-05 19:30:31 +08:00
minggo e1254fb3b2 Merge pull request #214 from minggo/android-performance
fix rendering performance issue on some Android devices
2016-07-18 18:02:10 +08:00
minggo c739457549 Merge pull request #222 from minggo/sync-15774
Texture2D::addImageAsync : Set pixel format correctly.
2016-07-18 18:00:11 +08:00
minggo c08e852525 SetBlending fix 2016-07-18 17:18:49 +08:00
minggo 0c75e52e1b Texture2D::addImageAsync : Set pixel format correctly. 2016-07-18 17:10:01 +08:00
minggo 9a3bc1750c fix rendering performance issue on some Android devices 2016-07-18 15:17:36 +08:00
zilongshanren c2e5a97f6a add system font label overflow 2016-06-12 17:43:02 +08:00
Wenhai Lin 0449d57993 refine 2016-05-12 16:31:16 +08:00
Wenhai Lin 194fa85b7e stability improvements 2016-05-10 22:48:00 +08:00
Wenhai Lin 52332dce9e Fixed possible crash on exit. 2016-05-09 16:37:55 +08:00
Wenhai Lin d4481bfd5a Refine (#48) 2016-04-28 11:58:34 +08:00
Wenhai Lin 6da52bccad Refine Websocket 2016-04-27 14:16:02 +08:00
Wenhai Lin efc97073e3 Fixed memory leak 2016-04-18 11:06:14 +08:00
Wenhai Lin ec1a1d65b7 Remove unnecessary 'void' modifier 2016-04-07 23:13:19 +08:00
Wenhai Lin 2a68bf1c50 Iterator erase pattern 2016-04-07 16:32:25 +08:00
Wenhai Lin 4b9f90861f Sync Bug fix 2016-04-07 11:07:46 +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