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

26 Commits

Author SHA1 Message Date
yangws 333f0b5574 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 
Conflicts:
	HelloWorld/AppDelegate.cpp
	cocos2dx/particle_nodes/CCParticleSystem.cpp
	cocos2dx/proj.win32/cocos2d-win32.vcproj
	tests/AppDelegate.cpp
 2011-01-20 11:18:35 +08:00
walzer ad5ee3c9f6 Merge remote branch 'remotes/origin/upto-0.99.5' Fix some conflicts manually. 2011-01-17 16:21:11 +08:00
yangws 67c0ad6332 add platform support project on win32. 
Move macros, CCXUIImage, ccxCommon, CCXCocos2dDefine, 3rd party libraries, glu, NSLock, ccxConfig from platform/win32 to platform_support.
 2011-01-15 18:05:35 +08:00
Li Lirong e58ba468ee fix some warnings under android 2010-12-29 10:30:42 +08:00
minggo 355570ea8f issue #292 2010-12-28 15:05:55 +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
Walzer 820c2f0714 issue #211 cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
Walzer b4328354af issue #211 cocos2dx -> cocos2d-x 2010-11-18 14:07:17 +00:00
Walzer fb25984f12 rename getShared methods to shared 2010-11-16 07:12:09 +00:00
Ming 416a319344 fixed #203 2010-11-13 03:34:49 +00:00
Ming 12d6df9717 issue #154 2010-09-24 10:10:32 +00:00
natural-law cd4bb0bfc8 issue #144 
Clear memory leaks of the test_uphone project
 2010-09-14 02:26:19 +00:00
Walzer 35fe435800 issue #121, return bool in function init**** 2010-09-04 05:39:37 +00:00
Ming 39c6ebf503 issue #85:remove the using of dynamic_cast() 2010-08-31 03:20:37 +00:00
Ming b9587a7062 2010-08-30 07:45:39 +00:00
Ming 19b75463ed issue #64: retain the object when it was added to the scheduler 2010-08-20 07:56:24 +00:00
Ming 2f638dbe14 issue #55 2010-08-18 06:57:36 +00:00
Ming f4fc30f651 fixed #32: changed because the implementation of CCActionManager 2010-08-05 06:38:42 +00:00
Ming 76f62adf62 fixed #30: change some header files to include 2010-08-04 08:45:00 +00:00
Walzer 14427a24d7 2010-08-04 07:46:12 +00:00
Ming 8c754ee5a9 issue #26: because it use some macro that using malloc and free, so we can not change it to new 2010-08-04 03:10:55 +00:00
Ming f236e4d542 issue #26: change malloc/calloc to new 2010-08-04 03:02:33 +00:00
Ming a2083303e9 issue #6: implement some function 2010-08-02 04:00:06 +00:00
Ming a324e38cb2 issue #21: change INT32 to int, change UINT to unsigned int 2010-08-02 02:58:00 +00:00
Ming c8477d4d16 issue #6: update CCScheduler.cpp 2010-07-20 03:40:22 +00:00
Ming cb5dcf8862 issue #6: add CCScheduler.cpp 2010-07-14 03:03:54 +00:00