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

189 Commits

Author SHA1 Message Date
natural-law 9ccbb62f6e fixed #313,Modify the main menu of tests project from page-turning to scroll. 2011-01-12 18:00:11 +08:00
natural-law 237042f7dd fixed #309,App will not crash any more when surface re-created. 2011-01-10 17:54:44 +08:00
minggo 78a7329054 Merge branch 'upto-0.99.5' of https://github.com/natural-law/cocos2d-x into natural-law-upto-0.99.5 2011-01-08 09:27:58 +08:00
natural-law c02a9a4dd5 Setting apk file path at runtime in cocos2d-android. 2011-01-07 16:29:06 +08:00
minggo 321c8098f3 make tests runs ok on iphone 2011-01-07 11:49:17 +08:00
natural-law ec7fbd0e69 Fix bugs. 
1. Run tests and HelloWorld in cocos2d-android.
2. Modify the makefile of cocos2d-uphone.
 2011-01-07 11:30:19 +08:00
natural-law 0d2d746aec Fix bugs.Run tests in cocos2d-uphone successful. 2011-01-05 17:01:08 +08:00
natural-law 25e9721678 fix bugs. 2011-01-04 17:46:23 +08:00
Walzer 4a6989b6ff [uphone] add keyMenuBack to CCKeypadDelegate 2010-12-31 18:15:30 +08:00
natural-law 3dfd530b38 Merge branch 'iss295' into upto-0.99.5 2010-12-31 09:48:48 +08:00
natural-law 34f45c8faa Implement CCEventDispatcher. 2010-12-31 09:36:53 +08:00
yangws 706f97114b issue #281 CCParticleSystemQuad upto-0.99.5 2010-12-28 11:55:34 +08:00
yangws 5e377f9368 issue #281 CCParticleSystemPoint.h upto-0.99.5 2010-12-28 11:09:40 +08:00
natural-law 01cd90f2cc update layers_scenes_transition_nodes to 0.99.5. 2010-12-27 09:40:45 +08:00
natural-law 4a64f899fe update label_nodes to 0.99.5. 2010-12-24 17:07:31 +08:00
minggo e3b49d7504 merge from minggo and natual-raw 2010-12-23 17:40:23 +08:00
minggo 6d98bc7b5d Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge 2010-12-23 16:22:37 +08:00
minggo 30f4c94bfb make a little change to upto-0.99.5 2010-12-23 10:35:09 +08:00
natural-law eeb4e99804 rename the action classes. 2010-12-22 15:43:54 +08:00
natural-law 4a765d33a3 rename the CCXXXAction files to CCActionXXX. 2010-12-22 15:15:04 +08:00
Walzer 5c9aea9ee7 Merge branch 'minggo-master' 2010-12-20 15:03:32 +08:00
Walzer 13865e7331 Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2010-12-20 15:03:12 +08:00
minggo 3d85f8f8d3 correct the error for checking the existance of resources 2010-12-20 14:44:38 +08:00
minggo dc980de055 copy resources correctly 2010-12-20 14:35:02 +08:00
minggo 32307cc3e0 copy resources from top directory 2010-12-20 14:21:33 +08:00
minggo 4c14ff2c2f copy resources from top directory 2010-12-20 14:17:51 +08:00
Walzer 156e667849 merge tests/proj.uphone & framework.uphone, merge tests/proj.win32 & framework.win32 2010-12-20 12:47:56 +08:00
natural-law 9a4f0c0283 fixed #267 Fix the bug of test case "ParallaxParticle" in ParticleTest. 2010-12-18 15:20:45 +08:00
Walzer 5c858b182c issue #243, fix warnings 2010-12-18 12:02:57 +08:00
Walzer edc742d41b Merge branch 'master' of https://github.com/leon-li/cocos2d-x into leon-li-master 2010-12-18 10:26:22 +08:00
Walzer b12f20c834 [iphone-cpp] SDKROOT = "iphoneos" instead of "iphoneos4.1" 2010-12-18 10:15:07 +08:00
Leon 96f4f5c9fd fix some compiling warning for iOS 2010-12-17 23:44:19 +08:00
Walzer 5a4c721f0c modify build_natvie.sh to use unix line feed character 2010-12-17 15:43:36 +08:00
Walzer 063f595e9a Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master 2010-12-16 12:03:25 +08:00
natural-law 95e697d316 fixed #262 Add namespace for the project CocosDenshion. 2010-12-15 18:28:18 +08:00
impact 7434748d4a Capitalization changes for building on linux (case-sensitive filesystem) 2010-12-15 01:00:35 -05:00
natural-law 2576bbe5b4 Merge branch 'master' into iss258 2010-12-14 13:53:25 +08:00
unknown acc30e35b1 Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master 2010-12-14 11:10:46 +08:00
unknown 57770086e6 Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2010-12-14 11:09:36 +08:00
natural-law 2c84b167e0 fixed #258 Move FileUtils.h from path "support/file_support" to path "include". 2010-12-14 10:45:23 +08:00
natural-law 341e7efb27 fixed #251 add a test case for CCKeypadDelegate 2010-12-14 10:23:20 +08:00
minggo a33823706d fixed #259 2010-12-14 09:42:39 +08:00
natural-law 8cb331994d Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge 2010-12-13 17:55:02 +08:00
unknown 7cc2498756 Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2010-12-13 16:53:16 +08:00
natural-law 2706e3a003 fixed #251 CCKeypadDelegate implement 2010-12-13 14:10:39 +08:00
minggo 4e0d856151 fixed #256 2010-12-13 11:36:35 +08:00
minggo faa3063ad0 Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2010-12-11 17:41:33 +08:00
minggo 2f0f89abb1 fixed #255 2010-12-11 17:34:07 +08:00
minggo 817af55e1e Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2010-12-11 13:26:26 +08:00
minggo b7e78d82ab fixed #254 2010-12-11 13:18:33 +08:00
Walzer dec419be71 Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2010-12-10 10:34:41 +08:00
minggo 6b37bc97d4 fixed #220: run tests on android 2010-12-09 10:50:02 +08:00
unknown 4d22e3b263 Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master 2010-12-08 18:03:35 +08:00
minggo a6855993f6 issue #220: android does not support glColor4ub, so use glColor4f instead 2010-12-06 11:15:16 +08:00
minggo 534a55eaa1 issue #220: All tests run on android emulator, but the effect of some tests are wrong 2010-12-06 09:51:21 +08:00
yangws 96115bc26e fixed #233 now don't call preMainLoop when application enter background, test ok on uphone device. 
fixed a CCXAppWiz.uphone bug, create a empty file named xxxxx_str_str.h when build.

Signed-off-by: yangws <yangws@cocos2d-x.org>
 2010-12-03 15:27:55 +08:00
minggo ad344d69fb fixed #238, checked in xcodeproj file for HelloWorld & tests 2010-12-03 14:39:07 +08:00
yangws 687fb199fc issue #233 stop main loop when application enter background. test ok on emulator 2010-12-02 18:44:13 +08:00
minggo d88b26c4d2 commit AppDelegate.cpp after merging 2010-11-29 15:57:53 +08:00
minggo 7fa8d72076 commit before merging the code from https://walzer@github.com/cocos2d/cocos2d-x.git 2010-11-29 15:54:32 +08:00
minggo 9a2ff2407a commit the change before merging master of cocos2d-x 2010-11-29 15:08:21 +08:00
natural-law 4d98faabc5 fixed #226 add support read resource file from zip file in cocos2d-uphone 2010-11-29 10:49:43 +08:00
Walzer b4152fa700 fixed #222 merge different HelloWorld to one directory just like "tests", except HelloWorld.android 2010-11-27 18:25:31 +08:00
Walzer 8854ec5b10 Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2010-11-26 11:59:56 +08:00
minggo aa826970eb fixed #224 2010-11-26 11:38:10 +08:00
walzer 29191a385e Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2010-11-24 10:38:01 +08:00
yangws 852c57d2c6 add CCLOG support on win32 and uphone 2010-11-23 18:20:46 +08:00
minggo 8be8a02e73 fixed #210: support accelemeter 2010-11-22 11:11:20 +08:00
yangws 9346275604 show fps 2010-11-19 03:14:19 +00:00
Walzer 3f8c167882 issue #211, add batch build for uphone 2010-11-19 02:59:27 +00:00
yangws d96599e787 2010-11-19 02:48:08 +00:00
Walzer 0ad77b779a issue #211 don't checkout 2010-11-18 15:55:00 +00:00
Walzer 26bfa32ca6 issue #211 don't check out 2010-11-18 14:56:54 +00:00
Walzer 5a44e5f1fe issue #211 don't checkout 2010-11-18 13:51:33 +00:00
Ming 202ed580d6 2010-11-18 08:32:32 +00:00
Ming 99b7ae73e9 2010-11-18 08:24:19 +00:00
Ming 04aa648c1b 2010-11-18 08:23:49 +00:00
Ming dc2f5f604f fixed #208 2010-11-18 07:38:47 +00:00
Ming 31809a3774 issue #208 2010-11-18 06:50:28 +00:00
yangws 4a432f3125 change win32 porject name after test ok. 2010-11-17 03:13:37 +00:00
yangws b181701039 change win32 porject name 2010-11-17 02:46:43 +00:00
yangws 0618af9711 change win32 project name 2010-11-17 02:16:21 +00:00
natural-law 10c6cd29f1 issue #189 
add support of Accelerometer sensor
 2010-11-16 09:09:12 +00:00
Walzer fb25984f12 rename getShared methods to shared 2010-11-16 07:12:09 +00:00
yangws 2587114512 issue #186 add template/CCXAppWiz.vs to cocos2dx. 2010-11-16 03:25:33 +00:00
yangws 2e6f7c0623 issue #205 vs2008 run tests win32 OK. 2010-11-15 02:57:15 +00:00
Walzer 9a431a434e fixed #198 reuse "tests" game logic between uphone & win32 platform! ohye~~ 2010-11-13 06:35:37 +00:00
Walzer aaf6a7f1ee makefile for test_uphone arm 2010-11-13 01:47:25 +00:00
Walzer ed7d1ca159 issue #198 now test_uphone & test_win32 directories are remove. "test" stands for them 2010-11-12 09:24:12 +00:00