Commit Graph

4804 Commits

Author SHA1 Message Date
pandamicro d6683e9376 Fix compilation issues on win32 2017-01-24 15:26:24 +08:00
Wang Nan 62a55fa172 Merge pull request #520 from zilongshanren/fix-bmfont-use-same-texture-issue
fix memory leaks of graphics node
2017-01-24 14:16:56 +08:00
pandamicro e37816eab3 Fix AssetsManager issues on x86 platform 2017-01-24 13:29:27 +08:00
zilongshanren 052e40a9f8 fix memory leaks of graphics node 2017-01-24 11:45:39 +08:00
pandamicro d74672cb02 Merge pull request #519 from pandamicro/v1.4
Fix nextSavePoint issue (it should be float)
2017-01-23 18:38:44 +08:00
pandamicro 292fd4a941 Fix nextSavePoint issue (it should be float) 2017-01-23 18:38:22 +08:00
子龙山人 eda1ae7ad8 Merge pull request #518 from zilongshanren/fix-bmfont-use-same-texture-issue
add opacity support to drawnode
2017-01-23 17:01:01 +08:00
zilongshanren 60f8d20c82 add opacity support to drawnode 2017-01-23 16:59:45 +08:00
pandamicro 8cfced97bf Merge pull request #517 from pandamicro/v1.4
Fix AssetsManager updateSucceed issue
2017-01-22 19:03:32 +08:00
pandamicro 1ada1f3351 Small fixes 2017-01-22 18:59:49 +08:00
pandamicro 13c57ba54a Add __ENABLE_GC_FOR_NATIVE_OBJECTS__ 2017-01-22 18:59:38 +08:00
pandamicro fca36add5d Fix updateSucceed issue 2017-01-22 18:59:18 +08:00
pandamicro fe4b471444 Merge pull request #516 from pandamicro/v1.4
Fix websocket cycling destructor issue
2017-01-22 18:44:16 +08:00
pandamicro cec9760bd0 Fix websocket cycling destructor issue 2017-01-22 18:43:32 +08:00
James Chen 2ff622a686 Updates external/config.json to use latest external libraries. 2017-01-20 16:44:46 +08:00
James Chen 5013c73f01 warning fix 2017-01-20 16:44:00 +08:00
knoxHuang 97c717989e fix handleTouchesMove bug for #cocos-creator/fireball/issues/5099 2017-01-20 11:43:08 +08:00
Wang Nan feddbe159b Merge pull request #509 from natural-law/hot-fix
Solve the error effect in the spine runtime.
2017-01-20 09:45:42 +08:00
zilongshanren b4092b7dea fix bmfont use same texture issue 2017-01-19 11:14:33 +08:00
子龙山人 5bf3b231f2 Merge pull request #512 from zilongshanren/fix-label-outline-toggle
fix videoplayer crash issue
2017-01-18 18:24:41 +08:00
zilongshanren 6d0fc9dcbf fix videoplayer crash issue 2017-01-18 18:16:19 +08:00
pandamicro e420c238b9 Avoid register too much succeed asset in manifest initialization 2017-01-18 10:11:25 +08:00
pandamicro 353009ae79 Register cppOwner ptr to ensure viability in destructor of JS wrappers 2017-01-18 10:09:46 +08:00
pandamicro e6ae546acd Fix Sequence and Spawn referencing sub action issues 2017-01-18 10:09:45 +08:00
zhangbin 6d80e8a931 Solve the error effect in the spine runtime. 2017-01-18 09:34:07 +08:00
pandamicro 87f2c31be5 Auto compartment when retain / release script object 2017-01-16 18:32:04 +08:00
pandamicro a6f038124e Fixed Unknown type TCHAR issue 2017-01-16 16:02:55 +08:00
Nan Wang 20d45b8e08 fixed FileUtils and downloader bindings in windows 2017-01-16 15:47:07 +08:00
CocosRobot 90e611f0d2 [AUTO][ci skip]: updating cocos2dx_files.json 2017-01-16 06:31:43 +00:00
pandamicro a4d8fd375b Improve xcode project settings 2017-01-16 14:23:22 +08:00
pandamicro 714c6b2338 Add network config to genbindings 2017-01-16 14:12:50 +08:00
CocosRobot bbf4e25926 [ci skip][AUTO]: updating jsbinding automatically 2017-01-16 06:06:07 +00:00
pandamicro bc915ddc44 Add Downloader bindings 2017-01-16 13:57:10 +08:00
pandamicro 1bf1f805ca Ensure zip file deletion 2017-01-16 13:56:04 +08:00
pandamicro 32223609c2 Avoid manifest failure being treated as succeed 2017-01-16 13:55:34 +08:00
pandamicro 57c7f0f687 Reduce frequency of writing temp manifest file 2017-01-16 13:55:01 +08:00
CocosRobot 598e507730 [ci skip][AUTO]: updating jsbinding automatically 2017-01-13 07:13:58 +00:00
pandamicro 40d600f1e2 Fix compilation issue when lambda function has return value 2017-01-13 15:06:39 +08:00
CocosRobot c12ae2a4c7 [AUTO][ci skip]: updating cocos2dx_files.json 2017-01-13 06:31:53 +00:00
pandamicro 0101edc8be Merge pull request #498 from pandamicro/v1.4
Fix compilation issues
2017-01-13 14:26:55 +08:00
pandamicro 6880584351 Fix compilation issues 2017-01-13 14:26:24 +08:00
子龙山人 eec2528efc Merge pull request #496 from CocosRobot/update_js_bindings_1484288331
[ci skip][AUTO]: updating jsbinding automatically
2017-01-13 14:24:59 +08:00
子龙山人 58ab827fe1 Merge pull request #497 from zilongshanren/fix-label-outline-toggle
make code more robost
2017-01-13 14:24:46 +08:00
zilongshanren 0a3ee883f9 make code more robost 2017-01-13 14:24:02 +08:00
CocosRobot 8d13229c7e [ci skip][AUTO]: updating jsbinding automatically 2017-01-13 06:20:54 +00:00
pandamicro f591c732ff Merge pull request #494 from pandamicro/v1.4
Improve more JSFunctionWrapper’s memory management
2017-01-13 14:15:28 +08:00
pandamicro 466826b40b Merge pull request #493 from zilongshanren/fix-label-outline-toggle
fix label outline toggle
2017-01-13 14:15:05 +08:00
pandamicro 79084632a6 Improve more JSFunctionWrapper’s memory management 2017-01-13 14:13:29 +08:00
zilongshanren bc364fb3bb fix label outline toggle 2017-01-13 14:12:32 +08:00
pandamicro b993577b57 Merge pull request #491 from pandamicro/v1.4
Fix AssetsManager issues collected from the community
2017-01-13 10:36:44 +08:00