Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
28,988 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

28988 Commits

Author SHA1 Message Date
Dale Stammen 0f3ff6f762 Merge branch 'v3' into v3-winrt-typo-fix 2015-04-21 18:18:00 -07:00
Dale Stammen 84a47000b5 rename -win to -winrt 2015-04-21 18:17:18 -07:00
Dale Stammen aec086a473 convert BGR and RGB to GUID_WICPixelFormat24bppRGB 2015-04-21 18:16:54 -07:00
Dale Stammen 516966a96f check for PixelFormat::DEFAULT 2015-04-21 18:11:56 -07:00
Dale Stammen e4ae0f9c2c disable INCREMENTAL for ARM builds. Fixes lnk2013 error 2015-04-21 08:50:43 -07:00
Dale Stammen a2ed8e7234 disable INCREMENTAL for ARM builds. Fixes lnk2013 error 2015-04-21 08:38:19 -07:00
Jimmy Yin 8c4cd7ea42 Modify default console and upload port for lua runtime 2015-04-21 23:07:19 +08:00
Dale Stammen 0c47df5df2 fixed typo. Changed KEY_BACKSPACE to KEY_ESCAPE in comments 2015-04-21 06:21:32 -07:00
lvlong 4f96037e15 1. Merge branch 'v3' of github.com:super626/cocos2d-x into v3 
2. fix bug: memory leak!
 2015-04-21 19:38:38 +08:00
andyque 6e34408cea update external deps to 43 2015-04-21 18:33:57 +08:00
CocosRobot 30ccbe3526 [AUTO]: updating luabinding automatically 2015-04-21 10:29:17 +00:00
xiaofeng11 e9871d904a Merge pull request #21 from pipu/modify_Node3DReader_serialize 
Modify that serialize base attribute for Node3DReader.
 2015-04-21 18:24:00 +08:00
minggo 0287b4213a Merge pull request #11535 from natural-law/v3 
[ci skip] Update the reference of submodule cocos2d-console.
 2015-04-21 18:22:09 +08:00
pipu fcd48ce2c3 Reset method purge() definition. 2015-04-21 18:16:38 +08:00
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
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
lvlong cae82fcdeb fix bug: memory leak 2015-04-21 15:02:09 +08: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
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
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