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

28903 Commits

Author SHA1 Message Date
minggo cf177bbbee Merge pull request #11559 from MSOpenTech/v3-winrt-fix 
V3 winrt fix to update Angle and correctly handle App termination
 2015-04-23 13:50:37 +08:00
Dale Stammen 431937edb4 updated version to v3-deps-44 2015-04-22 19:49:37 -07:00
minggo ca03fe8729 Merge pull request #11557 from CocosRobot/update_cocosfiles_1429756043 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-04-23 10:33:09 +08:00
CocosRobot 941c8d9f14 [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-23 02:27:24 +00:00
minggo 5640084281 Merge pull request #11550 from andyque/add-button-release-note 
add button memory optimization
 2015-04-23 10:25:20 +08:00
minggo 8ab03a62d1 Merge pull request #11543 from yinjimmy/runtime 
Add lua runtime template
 2015-04-23 10:25:00 +08:00
Dale Stammen 102726784e update windows 8.1 univeral app cpp-template files 2015-04-22 19:13:57 -07:00
Dale Stammen ac8755868d need to call Cleanup() if app is terminating 2015-04-22 19:13:12 -07:00
Dale Stammen b78f830ed8 cleaned up Draw() 2015-04-22 19:11:42 -07:00
Dale Stammen 4119b0f10d cleaned up Draw() 2015-04-22 19:11:29 -07:00
Dale Stammen 22daece170 made Cleanup() public 2015-04-22 19:08:11 -07:00
Dale Stammen c3335551b8 added EGL_PLATFORM_ANGLE_ENABLE_AUTOMATIC_TRIM_ANGLE 2015-04-22 19:07:48 -07:00
Dale Stammen 662f8374ae removed CC_PLATFORM_WINRT code. It is now allowed to exit a WinRT app 2015-04-22 17:58:10 -07:00
andyque b3f96cb2b2 add button memory optimization 2015-04-22 14:59:22 +08:00
minggo ca1a95f2bb Merge pull request #11545 from samuele3hu/v3_beta0_test 
Fix the cocos3.6beta0 bugs
 2015-04-22 14:38:54 +08:00
minggo bcc2bb7198 Merge pull request #11549 from CocosRobot/update_cocosfiles_1429671178 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-04-22 11:15:15 +08:00
CocosRobot d7e32f270c [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-22 02:53:00 +00:00
samuele3hu 8d9064b4e4 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_beta0_test 
Conflicts:
	tests/cpp-tests/Classes/AppDelegate.cpp
 2015-04-22 10:31:39 +08:00
minggo 1f5e5b5058 Merge pull request #11536 from xiaofeng11/v3 
Update Node3DReader compatibility
 2015-04-22 10:25:49 +08:00
minggo 44fefde83d Merge pull request #11537 from CocosRobot/update_lua_bindings_1429611994 
[AUTO]: updating luabinding automatically
 2015-04-22 10:25:31 +08:00
minggo a4d5624ef5 Merge pull request #11539 from MSOpenTech/v3-winrt-typo-fix 
fixed typo. Changed KEY_BACKSPACE to KEY_ESCAPE in comments
 2015-04-22 10:24:42 +08:00
samuele3hu 47e2698986 Fix the cocos3.6beta0 bugs 2015-04-22 10:20:21 +08:00
yinjimmy 94fe5ac206 set CC_CODE_IDE_DEBUG_SUPPORT=0 for lua-template-default 2015-04-22 10:12:40 +08:00
minggo 2e3cd632ce Merge pull request #11538 from andyque/update-deps-to-43 
update external deps to 43
 2015-04-22 09:44:48 +08:00
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
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
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