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

21775 Commits

Author SHA1 Message Date
minggo e3b149deda Merge pull request #7433 from heliclei/check-build-size 
check libcpp-empty-test.so size after successful build
 2014-07-14 16:25:52 +08:00
minggo b5a6ccc220 Merge pull request #7435 from Dhilan007/v3-320final 
fixed using the incorrect res in test case of 'TextureMemoryAlloc'.
 2014-07-14 16:25:10 +08:00
heliclei 9812532103 [ci skip]add .so to file name 2014-07-14 15:51:04 +08:00
Dhilan007 a5317dde87 fixed using the incorrect res in test case of 'TextureMemoryAlloc'. 2014-07-14 15:50:20 +08:00
heliclei 06ae2ba2a6 check libcpp-empty-test.so size after successful build 2014-07-14 15:30:11 +08:00
minggo f07270454d [ci skip] 2014-07-14 13:59:43 +08:00
minggo 92cfe90937 Merge pull request #7424 from kyokomi/bugfix_UITextField_ttfFont 
Fix the bug that UITextField doesn't support TTF font
 2014-07-14 13:57:54 +08:00
minggo 181d895053 Merge pull request #7429 from Dhilan007/v3-320final 
update test case of new label[lua].
 2014-07-14 13:57:31 +08:00
minggo 9f01645bdb Merge pull request #7430 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-07-14 13:53:28 +08:00
zhangbin 30ebba8d51 Update the reference of submodule cocos2d-console. 2014-07-14 13:51:44 +08:00
Dhilan007 8949d90212 update test case of new label[lua]. 2014-07-14 13:48:28 +08:00
minggo 62b9c72609 Merge pull request #7281 from aslmaswd/v3-cmake 
CMake Fix:GLFW header
 2014-07-14 11:18:51 +08:00
minggo 19e9879514 Merge pull request #7428 from Dhilan007/v3-320final 
fixed crash cause by incorrect font name.
 2014-07-14 10:16:28 +08:00
Dhilan007 b3017fb773 fixed crash cause by incorrect font name. 2014-07-14 10:01:29 +08:00
Dhilan007 d40d25104d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-game-controller 2014-07-14 09:56:34 +08:00
minggo cf5f14ab51 Merge pull request #7425 from minggo/change-test-case-name 
3D:Sprite3D -> Node:Sprite3D
 2014-07-12 22:27:42 +08:00
minggo 3b59b41116 3D:Sprite3D -> Node:Sprite3D 2014-07-12 22:26:46 +08:00
kyokomi 915bdae4a6 Fix the bug that UITextField doesn't support TTF font 2014-07-12 22:42:44 +09:00
minggo 7c43b59c6b Merge pull request #7422 from minggo/get-curent-language 
return correct language type
 2014-07-12 20:45:05 +08:00
minggo bf4b376ae5 return correct language type 2014-07-12 20:40:15 +08:00
minggo cfc291e49d Merge pull request #7379 from joshuastray/v3 
move JumoTo's copy constuctor and operator= to private
 2014-07-12 20:19:03 +08:00
minggo c371eb0b9d Merge pull request #7421 from darkdukey/fix_setup_script 
Fix setup.py can't resolve symlink
 2014-07-12 20:17:57 +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
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