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

28966 Commits

Author SHA1 Message Date
minggo 2d2f0aac59 fix indent 2015-04-27 16:25:24 +08:00
minggo 8c4cecca0d fix indent and translate Chinese comment to English 2015-04-27 16:22:54 +08:00
minggo c0b2433bb5 Merge branch 'v3' of https://github.com/qiutaoleo/cocos2d-x into check-filename-case-on-windows 2015-04-27 15:45:23 +08:00
minggo 98fcd83d50 Merge pull request #10870 from daiki1003/fix/scroll_view_container 
Fix container view's anchor point problem.
 2015-04-27 11:44:19 +08:00
minggo 92b7dcd64b Merge pull request #11601 from CocosRobot/update_lua_bindings_1430101389 
[AUTO]: updating luabinding automatically
 2015-04-27 11:32:12 +08:00
CocosRobot 09cddb4d4b [AUTO]: updating luabinding automatically 2015-04-27 02:25:05 +00:00
minggo c500d6b0a7 Merge pull request #11588 from WenhaiLin/v3-jsb 
[js-tests]Fixed crash.
 2015-04-27 10:20:07 +08:00
minggo d932d1e7e1 [ci skip]update CHANGELOG 2015-04-27 10:17:56 +08:00
minggo 033cfaa30b Merge pull request #11592 from fusijie/add_EaseRateAction_create_method 
Add EaseRateAction::create() method.
 2015-04-27 10:16:38 +08:00
minggo 838aa688b8 Merge pull request #11595 from loadrunner/seperate_typo 
fixed 'seperate' typo
 2015-04-27 09:33:12 +08:00
Danut Chereches 5f692962b9 fixed 'seperate' typo 
issue #8408
 2015-04-25 00:02:39 +03:00
Jacky 633c1aed75 Add EaseRateAction::create() method. 2015-04-24 18:31:44 +08:00
Wenhai Lin 23f8fa817a [js-tests]Fixed crash on iOS/Mac 2015-04-24 18:14:24 +08:00
WenhaiLin 5e5cd5faa1 [js-tests]Fixed crash on Win32/Universal. 2015-04-24 17:12:46 +08:00
minggo 2199bf1799 Merge pull request #11580 from CocosRobot/update_cocosfiles_1429845211 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-04-24 11:14:38 +08:00
CocosRobot dbdb29464b [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-24 03:13:32 +00:00
minggo 389121edcb Merge pull request #11575 from CocosRobot/update_cocosfiles_1429840412 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-04-24 11:11:41 +08:00
minggo 2245272922 Merge pull request #11560 from natural-law/v3-jsb 
Add js related files.
 2015-04-24 11:11:16 +08:00
zhangbin 252e5e1183 Make the lua projects temporarily works well. 2015-04-24 10:17:38 +08:00
CocosRobot 1ebcf7aeb4 [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-24 01:53:33 +00:00
minggo 4d3382b530 Merge pull request #11573 from pandamicro/v3_origin 
Sync Cocos2d-JS modifications to Cocos2d-x
 2015-04-24 09:51:26 +08:00
pandamicro c9fa9485a0 Update pluginx 2015-04-23 19:08:03 +08:00
pandamicro ec41965add Add get header and callback for Downloader 2015-04-23 19:07:07 +08:00
pandamicro 51f949540c Add ignore for v*-console-*.zip 2015-04-23 19:06:25 +08:00
pandamicro 6b4f8cc0ab Fix local storage get item issue when item inexist 2015-04-23 19:06:06 +08:00
pandamicro 3409f0fcd4 Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into v3_origin 2015-04-23 18:58:59 +08:00
zhangbin 44d3846b35 Update the version of 3rd party libs. 2015-04-23 18:11:45 +08:00
zhangbin b42307286c Solve the error when run js-tests on linux. 2015-04-23 16:51:57 +08:00
zhangbin 61cf0ad28b Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb 2015-04-23 15:46:19 +08:00
zhangbin dcca32bd82 Update the CMakeLists & the remote url of submodule js-bindings. 2015-04-23 14:23:19 +08:00
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
Bin Zhang b68ccea6f8 Merge pull request #32 from WenhaiLin/v3-jsb-merge 
Update the js-tests CMake files.
 2015-04-22 20:26:48 -07:00
Dale Stammen 431937edb4 updated version to v3-deps-44 2015-04-22 19:49:37 -07:00
WenhaiLin 55d3cc1252 Update the js-tests CMake files. 2015-04-23 10:42:44 +08: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