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

17237 Commits

Author SHA1 Message Date
James Chen 705ab115b8 Reuse the resources in cpp-tests. 2014-03-10 15:40:48 +08:00
James Chen 69bbda688b lua-tests works ok for iOS / Mac, luabindings has its own project. 2014-03-10 15:32:48 +08:00
Huabing.Xu f8f2373c2a closed #4315: fixed clippingNode alphaTest Bug 2014-03-10 15:12:44 +08:00
CaiWenzhi 26b3013f77 Format codes 2014-03-10 15:08:42 +08:00
boyu0 d5031f950a closed #4324: fix PhysicsContact::generateContactData() memory leak. 2014-03-10 14:51:26 +08:00
CaiWenzhi 888b328fd0 Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed 2014-03-10 14:38:43 +08:00
James Chen 650a88a8b1 Re-add lua bindings codes. 2014-03-10 14:04:58 +08:00
James Chen 66c9323a51 Merge pull request #5644 from CocosRobot/update_cocosfiles_1394431347 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-03-10 14:03:09 +08:00
CocosRobot c8da2c04ce [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-10 06:02:28 +00:00
James Chen c7502844f1 Merge pull request #5642 from dumganhar/re-add-lua 
Refactor folder structure, move 'tests' to 'samples/cpp-tests'
 2014-03-10 14:00:52 +08:00
James Chen 7841bceb2b [jenkins ci] Updates jenkins script 2014-03-10 13:50:14 +08:00
James Chen a5f668a0bf [travis ci] Build testcpp only. 2014-03-10 12:06:33 +08:00
CaiWenzhi 083872f65c Fixed bug of setting anchor point 2014-03-10 12:02:49 +08:00
James Chen 286ebb349f [jenkins] Don't gen jsb bindings. 2014-03-10 12:02:29 +08:00
James Chen 2e473027c1 Re-add xcode 'scheme' files. 2014-03-10 11:58:33 +08:00
James Chen ab1b10169e Compilation error fixes for Linux and Android. 2014-03-10 11:54:26 +08:00
CaiWenzhi f78d05c85f Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed 2014-03-10 11:49:15 +08:00
James Chen 218dc822e1 Updates win32 project configuration. 2014-03-10 11:23:35 +08:00
lihex 3b2a7328d3 update submodule 2014-03-10 11:14:11 +08:00
James Chen f800597541 Update AUTHORS [ci skip] 2014-03-10 10:57:36 +08:00
James Chen eca0bce1be Merge pull request #5633 from huangml/patch-1 
closed #4319: Node::removeAllChildrenWithCleanup() does not remove PhysicsBody.
 2014-03-10 10:55:54 +08:00
James Chen 11dc78a57b cocos2d_tests -> cocos2d_samples 2014-03-10 10:46:44 +08:00
James Chen f9ecaa3274 Deletes xcode xcschemes temporarily. 2014-03-10 10:30:48 +08:00
James Chen 4475209277 Renames 'cocos2d_tests.xcodeproj' to 'cocos2d_samples.xcodeproj' 2014-03-10 10:27:16 +08:00
James Chen 9926910c91 Adds lua-hello folder. 2014-03-10 10:25:31 +08:00
James Chen 956344f10f Adds empty folder, 'cpp-hello', 'lua-tests'. 2014-03-10 10:24:38 +08:00
James Chen 5354980d75 Rename 'tests' folder to 'samples', adds 'cpp-tests' folder. 2014-03-10 10:22:33 +08:00
CaiWenzhi 8d3f33bb30 Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed 2014-03-10 09:58:26 +08:00
minggo 763e255fee Merge pull request #5639 from lihex/develop 
add build-cfg.json for cocos2d-console to build android.
 2014-03-09 15:50:57 +08:00
lihex 3c9b4778b4 add build-cfg.json for cocos2d-console to build android. 2014-03-09 11:58:08 +08:00
James Chen 2784955845 Merge pull request #5636 from dumganhar/iss3290-onenter-order 
closed #3290: The order of onEnter / onExit  work correctly on JSB and LuaBindings.
 2014-03-08 22:35:09 +08:00
James Chen 7aec578b35 closed #3290: The order of onEnter works correctly on JSB and LuaBindings. 2014-03-08 22:07:55 +08:00
Zhe Wang c34064fae1 remove unsupported platforms from readme.md 2014-03-08 19:57:29 +08:00
Zhe Wang 9488667283 Merge pull request #5634 from walzer/develop 
remove script related submodules from .gitmodules file
 2014-03-08 18:07:28 +08:00
walzer b611d14ca7 remove submodules from .gitmodules file 2014-03-08 18:04:57 +08:00
黄梦龙 8b737d8aab Update CCNode.cpp 
removeAllChildrenWithCleanup() not remove PhysicsBody
 2014-03-08 17:42:35 +08:00
minggo 2158a3b013 Merge pull request #5630 from minggo/changelog-update 
update changelog
 2014-03-08 10:39:39 +08:00
minggo 38d2e821bf update changelog 2014-03-08 10:34:01 +08:00
Ricardo Quesada de513537ed Merge pull request #5629 from ricardoquesada/setup_fixes 
many usuability improvements
 2014-03-07 12:14:29 -08:00
Ricardo Quesada a0a6ab5d66 many usuability improvements 2014-03-07 12:12:25 -08:00
CaiWenzhi 80d97bb107 Modify action 2014-03-07 21:49:24 +08:00
minggo c291cb32a0 Merge pull request #5624 from Dhilan007/develop_label 
label:fixed vertical alignment is incorrect.
 2014-03-07 21:07:09 +08:00
minggo 7b42ca27c1 Merge pull request #5627 from nutty898/develop_nutty_modify_framework_for315CrashFixed 
Fixed crash
 2014-03-07 21:06:29 +08:00
CaiWenzhi 7b0d249e00 Fixed crash 2014-03-07 20:46:27 +08:00
minggo 2e4df3bcc6 Merge pull request #5626 from minggo/install 
set environment correctly on windows
 2014-03-07 19:40:24 +08:00
minggo ae791388ab Merge pull request #5625 from nutty898/develop_nutty_modify_framework_for315CrashFixed 
Fixed crash
 2014-03-07 19:39:54 +08:00
minggo 4b924fb717 set environment correctly on windows 2014-03-07 19:37:33 +08:00
James Chen d06c5a43c0 Update CHANGELOG [ci skip] 2014-03-07 19:10:54 +08:00
James Chen 84a76db060 Merge pull request #5622 from pandamicro/MotionStreakFix 
closed #4294: Added unimplemented position getter/setter in MotionStreak.
 2014-03-07 19:10:02 +08:00
pandamicro 2427314a65 Issue #4294: MotionStreak: Improve position setters 2014-03-07 19:06:51 +08:00