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

1107 Commits

Author SHA1 Message Date
minggo 4e35a660dc Merge branch 'upto-0.99.5' of https://github.com/yangws/cocos2d-x into yangws-upto-0.99.5 2010-12-27 10:55:59 +08:00
yangws c142070c2c misc_node upto-0.99.5. 
Signed-off-by: yangws <yangws@cocos2d-x.org>
 2010-12-25 15:09:42 +08:00
minggo 07b774bc6f Merge branch 'natural-law-upto-0.99.5' into upto-0.99.5 2010-12-25 09:24:15 +08:00
natural-law 4a64f899fe update label_nodes to 0.99.5. 2010-12-24 17:07:31 +08:00
minggo d6fb209861 merged from minggo-upto-0.995 to upto-0.99.5 2010-12-24 15:21:57 +08:00
natural-law 0f0a8ed956 rename the files related to label_nodes. 2010-12-24 14:00:49 +08:00
natural-law e11ccb50fe fixed #283 Add member data m_positionInPixels for some classes. 2010-12-24 11:40:44 +08:00
minggo e3b49d7504 merge from minggo and natual-raw 2010-12-23 17:40:23 +08:00
natural-law 3c6d1d8317 update actions to 0.99.5 2010-12-23 16:47:29 +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 7e4d8b9d1c set up base environment 2010-12-23 16:16:11 +08:00
minggo 3692d01c5a fixed #288 2010-12-23 14:18:08 +08:00
minggo 994a3b05ea fixed #273 2010-12-23 11:19:56 +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 e058e07d48 fix compile err & warnings at HelloWorld.iphone 2010-12-21 07:41:23 +08:00
Walzer ca7e4aa296 add WARNING into changelog, cocos2d-android-ndk isn't ready for game development. 2010-12-20 23:27:18 +08:00
Walzer 8f7650c2fc add changelog for version 0.7.1 2010-12-20 23:07:09 +08:00
Walzer f65a6eb90b [iphone-cpp] load image from buffer, support some PD formats 2010-12-20 18:46:58 +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
Walzer b9684cf123 issue #260, Helloworld.android will auto scale to WVGA resolution 2010-12-20 11:31:40 +08:00
Walzer 1995c5edd2 Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2010-12-20 10:26:00 +08:00
Walzer 46bc3744ae use the same textures with cocos2d-iphone in PD test 2010-12-20 10:17:36 +08:00
minggo 8891394a4c supporting compiled by ndk-r5 2010-12-20 10:01:12 +08:00
minggo ddaa654333 fixed #260 2010-12-18 18:23:31 +08:00
walzer 02bbc49111 Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2010-12-18 16:47:27 +08:00
Walzer 639d75e6eb Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master 2010-12-18 16:36:08 +08:00
minggo 9aa7e1bc84 fixed #245 2010-12-18 16:12:59 +08:00
minggo 87b926c74f match the declaration of cocos2dVersion 2010-12-18 16:08:57 +08:00
natural-law 9a4f0c0283 fixed #267 Fix the bug of test case "ParallaxParticle" in ParticleTest. 2010-12-18 15:20:45 +08:00
yangws 6d71a5b0f2 if defined COCOS2D_DEBUG, show messagebox when UIImage can't find resource file on disk. 2010-12-18 15:00:26 +08:00
natural-law 792781f5d6 fixed #266 fix a bug of message box in cocos2d-uphone pop-up at the wrong time. 2010-12-18 14:44:24 +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
Walzer 5f563102e9 fixed #265 2010-12-18 08:17:53 +08:00
Walzer 6de3f0f404 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2010-12-18 08:10:14 +08:00
Leon 96f4f5c9fd fix some compiling warning for iOS 2010-12-17 23:44:19 +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 7c23f13ee8 update README.mdown 2010-12-17 21:38:03 +08:00
Walzer 89e307ff16 update README.mdown, add desc of cocos2d-android-ndk current status. 2010-12-17 20:59:38 +08:00
Walzer 988d7289b8 Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master 2010-12-17 20:40:16 +08:00
Walzer 63bfa195db Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2010-12-17 20:36:24 +08:00