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

22039 Commits

Author SHA1 Message Date
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
chuanweizhang2013 a5a9dbe9f5 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime 2014-07-14 10:14:18 +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
Mazyad Alabduljaleel 04c5800ee8 [FIX]: When getting the string value, check which textfield is in use 
[FIX]: when setting the string value, change both textfields.
 2014-07-13 05:01:13 +04: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
cocoscodeide d73db9a1c1 Merge pull request #51 from chuanweizhang2013/v3luaruntime 
Add support keep screen on when is debug
 2014-07-12 16:39:01 +08:00
chuanweizhang2013 b8767420db Add support keep screen on when is debug 2014-07-12 16:29:39 +08:00
cocoscodeide 83babbab07 Merge pull request #50 from chuanweizhang2013/v3luaruntime 
modify version num
 2014-07-12 15:02:08 +08:00
chuanweizhang2013 d4834202b5 Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime 2014-07-12 14:55:29 +08:00
chuanweizhang2013 f22ae76c58 modify version num 2014-07-12 14:50:23 +08:00
chuanweizhang2013 e1d6e5aec3 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime 2014-07-12 14:39:21 +08:00
cocoscodeide 92866549c1 Merge pull request #49 from chuanweizhang2013/v3luaruntime 
fixed release error
 2014-07-12 14:17:17 +08:00
chuanweizhang2013 11838f20f4 fixed release error 2014-07-11 23:14:32 -07:00
cocoscodeide 4a63f29f8a Merge pull request #48 from chuanweizhang2013/v3luaruntime 
V3luaruntime
 2014-07-12 11:48:43 +08:00
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