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

17213 Commits

Author SHA1 Message Date
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
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
Dhilan007 792e182e12 typo fix and coding style improvements. 2014-03-11 14:32:07 +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
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
lihex 901116bc5b fix the lua template 2014-03-11 11:24:14 +08:00
James Chen c22740d96b Merge pull request #5651 from lmskater/fix-comment-trigger 
[Jenkins] fix the crash in comment trigger
 2014-03-11 11:00:10 +08:00
James Chen a6ece431b9 Merge pull request #5664 from CocosRobot/update_lua_bindings_1394506283 
[AUTO]: updating luabinding automatically
 2014-03-11 10:54:58 +08:00
James Chen e522f3b03b Update CHANGELOG [ci skip] 2014-03-11 10:52:28 +08:00
CocosRobot 725440fe3f [AUTO]: updating luabinding automatically 2014-03-11 02:52:22 +00:00
James Chen 3622b03c7b Merge pull request #5662 from boyu0/bug4324_physicscontact_memory_leak 
closed #4324: fix double free bug. move _preContactData to PhysicsContact class, add PhysicsContact::getPreContactData() method.
 2014-03-11 10:48:15 +08:00
boyu0 23f42da548 closed #4324: fix double free bug. move _preContactData to PhysicsContact class, add PhysicsContact::getPreContactData() method. 2014-03-11 05:09:08 +08:00
minggo 5e7f2dee8f Merge pull request #5643 from nutty898/develop_nutty_modify_framework_for315CrashFixed 
Develop nutty modify framework for315 crash fixed
 2014-03-10 21:49:22 +08:00
minggo 2aa5c7aadd Merge pull request #5649 from dabingnn/develop_fix_clippingNodeShaderBug 
closed #4315: fixed clippingNode alphaTest Bug
 2014-03-10 21:45:47 +08:00
Dhilan007 11d3acd478 fixed inappropriate usage of inline. 2014-03-10 20:35:36 +08:00
minggo e9b13772e8 Merge pull request #5660 from minggo/develop 
update console to latest codes
 2014-03-10 20:03:32 +08:00
minggo 376ae24c10 update console to latest codes 2014-03-10 20:01:22 +08:00
James Chen df55fea441 Merge pull request #5659 from dumganhar/re-add-lua 
Re-add lua template.
 2014-03-10 19:51:56 +08:00
minggo d0ba5dd55a Merge pull request #5658 from minggo/develop 
set ANT_ROOT environment variable
 2014-03-10 19:49:05 +08:00