Commit Graph

30113 Commits

Author SHA1 Message Date
pipu 04cde1c52c Modify that serialize base attribute for Node3DReader. 2015-04-21 18:05:46 +08:00
zhangbin dd022dd7b2 Update the reference of submodule cocos2d-console. 2015-04-21 17:28:53 +08:00
zhangbin bbb94985a0 Update the reference of submodule cocos2d-console. 2015-04-21 17:17:58 +08:00
minggo bdce0d955b [ci skip]update CHANGELOG 2015-04-21 17:12:16 +08:00
minggo 80bc3bf021 Merge pull request #11523 from MSOpenTech/v3-winrt-backbutton
V3 Windows Phone 8.1 back button support
2015-04-21 17:10:01 +08:00
minggo 590c411352 Merge pull request #11532 from CocosRobot/update_cocosfiles_1429606976
[AUTO][ci skip]: updating cocos2dx_files.json
2015-04-21 17:09:13 +08:00
CocosRobot e218110107 [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-21 09:02:58 +00:00
minggo 981b8b4f42 Merge pull request #11531 from natural-law/v3
[ci skip] Update the reference of submodule cocos2d-console.
2015-04-21 17:00:42 +08:00
zhangbin fca642e88e Update the reference of submodule cocos2d-console. 2015-04-21 16:55:46 +08:00
zhangbin f75bf93706 Update the js-tests project files. 2015-04-21 15:30:47 +08:00
lvlong cae82fcdeb fix bug: memory leak 2015-04-21 15:02:09 +08:00
hobogenized e2aaa88f1e Attempting to fix build error; removed extraneous comment 2015-04-21 01:56:02 -04:00
hobogenized 33f642c298 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into my_fix_branch 2015-04-21 01:51:52 -04:00
hobogenized 9b34e60896 Renamed another shadowed variable since ii was already taken 2015-04-21 00:12:51 -04:00
zhangbin 8abd2269bd Update js bindings. 2015-04-21 11:46:00 +08:00
hobogenized b7b6307703 Using ii instead of currIndex for brevity 2015-04-20 23:13:53 -04:00
hobogenized 22df7df76a Renamed shadowed variables to reduce confusion when reading source code 2015-04-20 22:57:55 -04:00
minggo f6276dd4b3 Merge pull request #10983 from perminovVS/v3-texture-init-check-error
Clean possible GL error init Texture2D
2015-04-21 09:50:54 +08:00
Dale Stammen 83b68ef693 added comment on how back button event is handled 2015-04-20 18:36:58 -07:00
minggo 7a1a021974 Merge pull request #11517 from andyque/fix-widget-gray-shader-issue
Fix widget gray shader issue
2015-04-21 09:34:18 +08:00
minggo fa6735e68f Merge pull request #11518 from perminovVS/v3-dev-optimize-vec3-v2.1
Optimize Vec3 use constructor default.
2015-04-21 09:33:05 +08:00
Dale Stammen 50f381f070 added CCLOG message to describe how to handle Windows Phone back button event 2015-04-20 18:30:52 -07:00
minggo 3e9fd67ab2 Merge pull request #11520 from super626/v3
Improve Animate3D
2015-04-21 09:30:43 +08:00
Dale Stammen 4169ebf5c8 Windows Phone 8.1 back button and terminate app support 2015-04-20 10:43:34 -07:00
Dale Stammen 6c7ecf0b18 removed CC_PLATFORM_WINRT messagebox code 2015-04-20 10:32:11 -07:00
yinjimmy 2c0f1c1a50 add lua runtime template 2015-04-21 01:25:44 +08:00
Dale Stammen e00b0dfbd9 Merge branch 'v3' into v3-winrt-backbutton 2015-04-20 08:17:16 -07:00
yangxiao 7c37123dbd remove fade in animation if no running animation 2015-04-20 19:45:31 +08:00
yangxiao e8b21589fc avoid some remap 2015-04-20 19:33:16 +08:00
minggo fd3e38be1a Merge pull request #11519 from htlxyz/fix_win32_app_retun_code
fixed win32 application return code
2015-04-20 18:32:17 +08:00
htl 2476f2b52d fixed win32 application return code 2015-04-20 18:27:21 +08:00
yangxiao 1a50610c00 Merge branch 'newcode' into v3 2015-04-20 18:21:07 +08:00
zhangbin 6ee624796a Merge branch 'v3-jsb' of github.com:natural-law/cocos2d-x into v3-jsb 2015-04-20 18:09:57 +08:00
zhangbin a1b5fa5a8e Solve the error in js template. 2015-04-20 18:09:39 +08:00
Vladimir Perminov 6ef1e7e3d0 Optimize Vec3 use constructor default.
Make Vec3 vec3(Vec3::ZERO); to Vec3 vec3;
2015-04-20 12:56:43 +03:00
andyque 484153aff7 remove ui shaders in windows platform 2015-04-20 17:54:49 +08:00
yangxiao bc62338b36 map use node instead of sprite 2015-04-20 17:49:01 +08:00
Bin Zhang b0ab12e0e7 Merge pull request #31 from WenhaiLin/v3-jsb-merge
Split the project files of JSB into separate files.
2015-04-20 02:28:26 -07:00
Wenhai Lin ed79f66b9f Fixed compile errors 2015-04-20 17:19:58 +08:00
minggo 15fe283c2e Merge pull request #11515 from xiaofeng11/v3
update compatibility for upgraded node3d come with 2.2.5 version
2015-04-20 17:05:32 +08:00
andyque 6fb29ad1b0 remove uishader settings 2015-04-20 17:04:49 +08:00
andyque e02dad3489 fix ui grayscale shader memory release issue 2015-04-20 17:00:40 +08:00
xiaofeng11 2c0350c1a6 Merge pull request #20 from pipu/parse_Node3DReader_position
Modify that parse position for Node3DReader.
2015-04-20 16:11:31 +08:00
minggo cdf00408a7 Merge pull request #11513 from andyque/fix-wp8.1-include-path
fix freetype include path on win-8.1
2015-04-20 16:01:55 +08:00
minggo d87b175167 Merge pull request #11512 from CocosRobot/update_cocosfiles_1429516413
[AUTO][ci skip]: updating cocos2dx_files.json
2015-04-20 16:00:34 +08:00
pipu 388e4b3a93 Modify that parse position for Node3DReader. 2015-04-20 15:56:36 +08:00
andyque 1e514f0a2b fix freetype include path on win-8.1 2015-04-20 15:54:31 +08:00
CocosRobot ebd76defe6 [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-20 07:53:34 +00:00
minggo 76613fc85f Merge pull request #11506 from CocosRobot/update_lua_bindings_1429508341
[AUTO]: updating luabinding automatically
2015-04-20 15:51:57 +08:00
minggo 8f88afa123 Merge pull request #11510 from xiaofeng11/v3
Bug fix
2015-04-20 15:50:44 +08:00