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

17233 Commits

Author SHA1 Message Date
James Chen 1df6acd10f Merge pull request #5661 from dumganhar/re-add-lua 
Adds 'cpp-empty-test', 'lua-empty-test' project
 2014-03-11 22:50:39 +08:00
James Chen fbcf1e7193 Updates pull-request-builder.py, do 'git clean -fdx -f' after checkout a new branch. 2014-03-11 22:05:50 +08:00
minggo 63a54b3462 Merge pull request #5685 from lihex/develop 
update submodule
 2014-03-11 22:05:25 +08:00
lihex 1e8990744e update submodule 2014-03-11 22:02:47 +08:00
minggo 86219dd7f4 Merge pull request #5676 from chuanweizhang2013/luamerage 
lua template default
 2014-03-11 21:54:08 +08:00
James Chen 8feccc45ee Updates win32 project. 2014-03-11 21:52:03 +08:00
James Chen e825324a94 [jenkins ci] Updates pull-request-builder.py. Uses 'git clean -fdx -f' to remove all files that are not in current repo. 2014-03-11 21:39:31 +08:00
James Chen 3adc62679f Updates Jenkins ci. 2014-03-11 20:47:02 +08:00
James Chen 4444e3872e [jenkins ci] Build only cpp-empty-test, cpp-tests. 2014-03-11 19:39:20 +08:00
James Chen 8c56b11819 Updates Xcode project and adds scheme for xcbuild. 2014-03-11 19:27:55 +08:00
James Chen 79e979ac71 updates CMakeLists.txt 2014-03-11 19:10:37 +08:00
James Chen 25604d3872 Update CMakeLists.txt 2014-03-11 19:10:37 +08:00
James Chen d0ec54e30e Update CMakeLists.txt 2014-03-11 19:10:37 +08:00
James Chen 6ad4b191a6 Update CMakeLists.txt 2014-03-11 19:10:36 +08:00
James Chen cbd9cbaf71 travis builds all tests projects for Android. 2014-03-11 19:10:36 +08:00
James Chen 58e21884f8 TestsDemo -> CppTests. 2014-03-11 19:10:36 +08:00
James Chen 99ffde24d2 [Android] Prefer to install tests to external storage device. 2014-03-11 19:10:36 +08:00
James Chen 431e800dd6 All tests could run on Android. 2014-03-11 19:10:36 +08:00
James Chen b635d9abd9 Remove .gitkeep in 'cpp-empty-test', Add proguard-project.txt. 2014-03-11 19:10:36 +08:00
James Chen 3d5c3001bd cpp-empty-test works ok for Android. 2014-03-11 19:10:36 +08:00
James Chen 91a3ba61da lua-empty-test, cpp-empty-test work for iOS/Mac 2014-03-11 19:10:36 +08:00
James Chen fda8cfa740 plist rename. 2014-03-11 19:10:35 +08:00
James Chen 2485f86777 lua-empty-test folder structure refactoring. 2014-03-11 19:10:35 +08:00
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
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
samuele3hu 3fe51ed518 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_fix 2014-03-11 17:49:33 +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
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