Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,281 Commits 2 Branches 33 Tags 1.2 GiB
Commit Graph

18281 Commits

Author SHA1 Message Date
James Chen 7504a25d9c cpp-hello -> cpp-empty-test, lua-hello -> lua-empty-test, ouch.... 2014-03-11 19:10:35 +08:00
James Chen b88de91a15 Renames 'samples' folder to 'tests', ouch.... 2014-03-11 19:10:34 +08:00
James Chen 36e9f55c98 Renames cocos2d_samples to cocos2d_tests, what could i say? 2014-03-11 19:10:09 +08:00
James Chen 69fc09d715 Removes xcscheme for test project. 2014-03-11 19:10:09 +08:00
James Chen f23bb8c9c1 Adds lua-hello samples, it works on iOS / Mac . 2014-03-11 19:10:09 +08:00
James Chen c156a1df04 Removes unused configuration for Xcode. 2014-03-11 19:10:09 +08:00
James Chen 27729db97b Re-add hellocpp, hellolua 2014-03-11 19:10:09 +08:00
minggo b2e27947a3 Merge pull request #5654 from dabingnn/develop_RenderTextureImprovement 
Develop render texture improvement
 2014-03-11 18:50:51 +08:00
andyque b95bba56d8 update vs2012 project dependency 2014-03-11 18:48:28 +08:00
andyque 48772fb952 modify android makefile 2014-03-11 18:48:28 +08:00
andyque df7aa27b8b fix mac lua 2014-03-11 18:48:28 +08:00
andyque 026ef95b07 add lua ui binding 2014-03-11 18:48:27 +08:00
andyque dcc98ef79f rename cocos2dx_gui to cocos2dx_ui 2014-03-11 18:48:27 +08:00
andyque 032ca5f309 rename cocosgui resource to cocosui 2014-03-11 18:48:27 +08:00
andyque cbcc1bbbcf let ios project compile correct 2014-03-11 18:48:26 +08:00
andyque d309286c84 rename gui folder to ui 2014-03-11 18:48:25 +08:00
Dhilan007 13aa532cff update test case. 2014-03-11 18:26:25 +08:00
James Chen ed9de19738 Merge pull request #5678 from samuele3hu/develop_new_fix 
fix: The return value of `luaval_to_dictionary` was wrong and remove some warning
 2014-03-11 18:20:14 +08:00
Dhilan007 df12ca963e issue #4337:label support create by font name,compatible with old labelTTF 
1.fixed color and opacity has not yet gone into effect.
2.fixed display is not consistent with old LabelTTF when content scale factor of Director not equal to 1.
 2014-03-11 18:06:14 +08:00
samuele3hu 3fe51ed518 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_fix 2014-03-11 17:49:33 +08:00
chuanweizhang2013 2094d4cbfd Merge branch 'develop' of https://github.com/chuanweizhang2013/cocos2d-x into develop 2014-03-11 17:49:10 +08:00
minggo 5b24eeee80 Merge pull request #5677 from lihex/develop 
update console submodule
 2014-03-11 17:48:35 +08:00
lihex 1c533a7746 update console submodule 2014-03-11 17:43:35 +08:00
samuele3hu 9a30984783 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_fix 2014-03-11 17:36:43 +08:00
samuele3hu 5c33155bc9 fix:Remove some warning about lua. 2014-03-11 17:35:09 +08:00
minggo 0202a678be Merge pull request #5675 from minggo/develop 
update console to latest version
 2014-03-11 16:56:28 +08:00
James Chen 246b267458 Merge pull request #5674 from CocosRobot/update_lua_bindings_1394527022 
[AUTO]: updating luabinding automatically
 2014-03-11 16:53:26 +08:00
cw 133a68f614 add runtime template 2014-03-11 16:52:06 +08:00
minggo 9d1a70d569 update console to latest version 2014-03-11 16:47:16 +08:00
CocosRobot b6ebd84534 [AUTO]: updating luabinding automatically 2014-03-11 08:38:10 +00:00
James Chen 2f877de428 Merge pull request #5657 from Dhilan007/develop_label 
closed #4337:label support create by font name,compatible with old labelTTF
 2014-03-11 16:29:29 +08:00
Dhilan007 b72d009eac Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-03-11 16:16:07 +08:00
James Chen b2e3f62a84 Merge pull request #5673 from Dhilan007/develop_gblur 
re-open configuration for generate binding glue codes.
 2014-03-11 16:02:12 +08:00
Dhilan007 41c8b6064e re-open generate binding glue codes. 2014-03-11 15:30:48 +08:00
heliclei 80417f0f35 correct naming convetion 2014-03-11 15:27:28 +08:00
Dhilan007 c2ef7b8796 fix incorrect implementation of Label::getContentSize 2014-03-11 15:03:16 +08:00
minggo 08e2c9a79f Merge pull request #5672 from minggo/develop 
set ANDROID_SDK_ROOT to correct path
 2014-03-11 14:55:56 +08:00
minggo 6c564e4c97 set ANDROID_SDK_ROOT to correct path 2014-03-11 14:54:14 +08:00
cw e3410d5ee1 merage cocos2d-x lua templateMerge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-03-11 14:42:33 +08:00
Dhilan007 792e182e12 typo fix and coding style improvements. 2014-03-11 14:32:07 +08:00
heliclei 8db680b9ee add EnumChildNodesByName, walk node tree with callback 2014-03-11 13:58:43 +08:00
CaiWenzhi ae8286bc5e Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed 2014-03-11 13:47:33 +08:00
yinkaile c60e0676f7 Merge pull request #3 from geron-cn/develop 
repair bug: changedisplay(armature,i>=0) does not reblind parentbone
 2014-03-11 13:44:27 +08:00
Geron 09c6d196a2 Merge pull request #1 from 2youyouo2/develop 
merge kaile
 2014-03-11 12:37:55 +08:00
minggo 4f621e71ca Merge pull request #5670 from minggo/develop 
ask to set ANT_ROOT, and add more redeable information
 2014-03-11 12:00:46 +08:00
minggo c72586ddbe ask to set ANT_ROOT, and add more redeable information 2014-03-11 11:57:51 +08:00
CaiWenzhi 3554047b62 Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed 2014-03-11 11:56:39 +08:00
CaiWenzhi 6efa17cddf Add event type to ListView 2014-03-11 11:53:44 +08:00
James Chen 21df081bd0 Merge pull request #5667 from lihex/develop 
fix the lua template
 2014-03-11 11:34:14 +08:00
lihex 4fd2040366 Merge branch 'develop' of https://github.com/lihex/cocos2d-x into develop 2014-03-11 11:24:46 +08:00