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

22782 Commits

Author SHA1 Message Date
chuanweizhang2013 56a95a2e52 move setDisplayStats function 2014-07-12 11:42:39 +08:00
cocoscodeide be5da3d74d Merge pull request #47 from cocos2d/v3 
update cocos2d-x
 2014-07-12 10:49:44 +08:00
Nite Luo 85b2029b3f Refactor setup.py reuse some of the code 2014-07-11 15:03:40 -07:00
Nite Luo 3cd16a7915 Fix setup.py that can't deal with symlink when setup environment variables 2014-07-11 14:14:02 -07:00
Dhilan007 dec2a5816e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-game-controller 2014-07-11 23:09:13 +08:00
minggo 7a8f52ab82 Merge pull request #7419 from CocosRobot/update_cocosfiles_1405077070 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-07-11 20:39:09 +08:00
minggo e6ab98a9f4 Merge pull request #7416 from CocosRobot/update_lua_bindings_1405076187 
[AUTO]: updating luabinding automatically
 2014-07-11 20:38:31 +08:00
minggo 5c26dc5db4 Merge pull request #7417 from geron-cn/chukongv3 
fix bug: crash in ui csbs
 2014-07-11 20:37:51 +08:00
CocosRobot 4b9ce2e663 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-11 11:11:12 +00:00
geron-cn 64408a5d8f fix bug: crash in ui csbs 2014-07-11 19:02:14 +08:00
CocosRobot 444d030b41 [AUTO]: updating luabinding automatically 2014-07-11 10:59:10 +00:00
minggo 05b485cd41 Merge pull request #7407 from visiblelight/fix_wp8_errors 
Fix compile errors on WP8
 2014-07-11 18:51:23 +08:00
minggo 86e5b37f16 Merge pull request #7413 from CocosRobot/update_lua_bindings_1405071955 
[AUTO]: updating luabinding automatically
 2014-07-11 18:50:58 +08:00
minggo 8cdbe5a019 Merge pull request #7412 from Dhilan007/v3-320final 
fixed warning: deleting pointer to incomplete type.
 2014-07-11 18:50:25 +08:00
minggo 7ed9789b50 Merge pull request #7414 from samuele3hu/v3_hot_fix 
Fix the tests-lua crash on windows platform
 2014-07-11 18:48:41 +08:00
samuele3hu fec8e44169 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-11 18:14:32 +08:00
samuele3hu 9c7999d1c2 Fix the tests-lua crash on windows platform 2014-07-11 18:13:08 +08:00
Dhilan007 18b988d771 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-game-controller 2014-07-11 17:51:15 +08:00
CocosRobot 87aaf7dcef [AUTO]: updating luabinding automatically 2014-07-11 09:48:20 +00:00
Dhilan007 d2e8154dc3 fixed warning: deleting pointer to incomplete type. 2014-07-11 17:45:15 +08:00
minggo 7308668e63 Merge pull request #7411 from minggo/warning-fix 
fix warnings
 2014-07-11 17:42:12 +08:00
minggo ecb915fabf fix warnings 2014-07-11 17:39:56 +08:00
minggo fd433898a6 Merge pull request #7287 from samuele3hu/v3_hot_fix 
Add the Lua bindings for FastTMXTileMap and FastTMXLayer,then add related test cases
 2014-07-11 17:33:08 +08:00
samuele3hu 3c8dc7a596 Update the cocos2d.ini config 2014-07-11 17:21:55 +08:00
samuele3hu 01c3f2a4ed Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 
Conflicts:
	tests/lua-tests/src/mainMenu.lua
	tools/tolua/cocos2dx.ini
 2014-07-11 16:44:59 +08:00
minggo 0c28b676fb Merge pull request #7408 from samuele3hu/v3_test 
Remove glView setting codes form AppDelegate.cpp to related lua script
 2014-07-11 16:38:34 +08:00
chuanweizhang2013 47fa341934 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime 2014-07-11 16:19:41 +08:00
samuele3hu d1bd21b1db Fix the bug that LuaStack::executeFunctionReturnArray hasn't deal with the condition of numArgs == 0 2014-07-11 16:17:51 +08:00
samuele3hu d9291031cd Fix the bug that LuaStack::executeFunctionReturnArray hasn't deal with the condition of numArgs == 0 2014-07-11 16:10:42 +08:00
vision 7495a611ea fix conflict 2014-07-11 16:03:40 +08:00
samuele3hu 229ad0cc27 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_test 2014-07-11 16:01:12 +08:00
samuele3hu 175ff37302 Remove glView setting form cpp to lua script and remove lua bindings for Bone3D 2014-07-11 16:00:02 +08:00
samuele3hu 82070e5205 Remove glView setting form cpp to lua script 2014-07-11 15:34:56 +08:00
samuele3hu 54970c109f Fix the bug that LuaStack::executeFunctionReturnArray hasn't deal with the condition of numArgs == 0 2014-07-11 15:34:21 +08:00
Dhilan007 d8cdb75851 Fix compile errors on WP8 2014-07-11 15:10:19 +08:00
minggo c71eec610a Merge pull request #7406 from andyque/fixMacProj 
fix ios project bug
 2014-07-11 14:51:36 +08:00
andyque da80170d06 fix ios project bug 2014-07-11 14:55:00 +08:00
minggo 627443ce5e Merge pull request #7405 from CocosRobot/update_cocosfiles_1405059271 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-07-11 14:18:47 +08:00
minggo c63983345b Merge pull request #7353 from andyque/addStudio1.4 
add studio v1.3, v1.4, v1.5 tests
 2014-07-11 14:15:07 +08:00
andyque 74772e97c9 fix linux compile error 2014-07-11 14:17:57 +08:00
CocosRobot 57827e9465 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-11 06:14:32 +00:00
andyque d4122d616a fix text reader binray version setFontName 2014-07-11 13:58:08 +08:00
andyque 43255e2b96 Merge branch 'v3' into addStudio1.4 
Conflicts:
	cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.cpp
 2014-07-11 13:55:13 +08:00
minggo f7cd1fc9cc Merge pull request #7399 from CocosRobot/update_cocosfiles_1405057476 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-07-11 13:53:15 +08:00
minggo 41c267fdb7 Merge pull request #7400 from CocosRobot/update_lua_bindings_1405057491 
[AUTO]: updating luabinding automatically
 2014-07-11 13:52:38 +08:00
CocosRobot 563386a777 [AUTO]: updating luabinding automatically 2014-07-11 05:46:37 +00:00
CocosRobot b32bd895a0 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-11 05:44:37 +00:00
minggo f205c0b704 Merge pull request #7392 from xhcnb/fix_CC_ENABLE_SCRIPT_BINDING_build 
Fix build with -DCC_ENABLE_SCRIPT_BINDING=0 , it causes failed
 2014-07-11 13:41:33 +08:00
minggo 9e74048409 Merge pull request #7397 from CocosRobot/update_lua_bindings_1405057136 
[AUTO]: updating luabinding automatically
 2014-07-11 13:41:06 +08:00
CocosRobot cdf8743597 [AUTO]: updating luabinding automatically 2014-07-11 05:40:36 +00:00