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

40 Commits

Author SHA1 Message Date
minggo 7a331e1e14 issue #375: wophone compiled ok 2011-03-07 18:20:48 +08:00
minggo b5a99f90df issue #375: rename file names and object names 2011-03-07 17:11:57 +08:00
yangws 34a6ca5208 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 
Conflicts:
	cocos2dx/platform/win32/CCXUIImage_win32.cpp
	cocos2dx/platform/win32/CCXUIImage_win32.h
	tests/test.win32/test.win32.vcproj
 2011-01-28 14:33:47 +08:00
yangws 76ea63da7f Change prefix CCX to ccx. 2011-01-27 17:07:36 +08:00
natural-law 3746af1d63 fixed #328.Modify the function and parameter name. 2011-01-26 15:43:12 +08:00
natural-law 7015e85918 fixed #328.By default,pop up a err dialog when loading textures failed. 2011-01-26 11:50:13 +08:00
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 a9f90256b8 fix the wrong direction of particle system 2011-01-20 10:21:41 +08:00
yangws 79b711a758 move CCXBitmapDC from cocos2d/platform to platform_support. 2011-01-19 14:23:26 +08:00
minggo f3e8665387 remove the usage of YES and NO 2010-12-31 16:37:00 +08:00
minggo d0a16a246e fixed comipling error and link error of upto-0.99.5 2010-12-31 14:56:24 +08:00
minggo 7b804d985b merge yangws-upto-0.99.5 into upto-0.99.5 2010-12-30 10:25:35 +08:00
minggo b2b8591b26 fixed #279 2010-12-28 10:23:14 +08:00
yangws afd9675854 CCParticleSystem upto-0.99.5 2010-12-27 17:39:15 +08:00
Walzer 641bea0abc fixed #265 compile error when enable CC_XXX_DEBUG_DRAW switchs in ccConfig.h 2010-12-17 23:18:03 +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 a279e5dc9b issue 169, we should retain the new variable first, and then release the old one. assignment at last. 2010-09-27 10:19:10 +00:00
Walzer b2d950743b issue 136, use NSDictionary in CCSpriteFrameCache 2010-09-10 06:08:25 +00:00
Walzer a1f3f89517 fixed #134, save plist file name 2010-09-08 01:52:30 +00:00
Walzer 64d0d7a7e1 fixed #134, fullPathFromRelativeFile, modify CCTextureCache::addImage 2010-09-08 01:28:28 +00:00
Walzer 4b86b49b08 fixed #134, fullPathFromRelativeFile, modify CCTextureCache::addImage 2010-09-07 10:04:57 +00:00
natural-law bd796c7452 issue #130 
Add function to set the resource path
 2010-09-07 08:30:31 +00:00
Ming b12fac2958 issue #61: 2010-09-06 02:04:28 +00:00
Walzer 4226dcede9 issue #61, add retain for member variable 2010-09-04 10:06:26 +00:00
Walzer 43a4664534 issue #114, CCTMXTiledMap debug 2010-09-02 07:31:37 +00:00
Walzer aec3660ec4 issue #18, debug 2010-08-28 08:28:30 +00:00
Walzer cac04e3bfc issue #18, debug 2010-08-28 08:23:03 +00:00
Walzer 2367ceed67 issue #82: debug CCParticleSystem::initWithDictionary ,break and return false if there is something wrong 2010-08-27 07:17:15 +00:00
Walzer daa63cebda issue #82: implement initWithDictionary 2010-08-26 09:22:23 +00:00
Walzer 2658199ead issue #82: debug 2010-08-26 06:06:41 +00:00
Ming 7291056154 fixed #86 2010-08-25 09:21:38 +00:00
Ming 32fbef7d34 issue 82: remove the including of "platform/platform.h" 2010-08-25 06:37:40 +00:00
Walzer b34b5b379e issue #82: debug , undefine CCDictionary 2010-08-25 03:36:57 +00:00
Ming 710e29b086 issue #80 2010-08-25 02:19:20 +00:00
Walzer cbccd4b1f8 issue #62, debug 2010-08-24 09:12:16 +00:00
Walzer e838e5c8b9 issue #62, debug 2010-08-24 06:40:30 +00:00
Walzer 2051869da5 issue #62, debug 2010-08-24 06:30:03 +00:00
Walzer df7092b83b issue #62, debug 2010-08-23 09:53:43 +00:00
Walzer 0fd94875fb fixed #62, complete particle system 2010-08-23 06:57:37 +00:00