axmol/cocos2dx
natural-law 8cb331994d Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge 2010-12-13 17:55:02 +08:00
..
actions fixed #240, CCSequence(..., CCHide::action(), ...) will not break down now. 2010-12-04 15:03:07 +08:00
base_nodes issue #211 cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
cocoa commit before merging the code from https://walzer@github.com/cocos2d/cocos2d-x.git 2010-11-29 15:54:32 +08:00
effects issue #211 cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
include fixed #251 CCKeypadDelegate implement 2010-12-13 14:10:39 +08:00
keypad_dispatcher fixed #251 CCKeypadDelegate implement 2010-12-13 14:10:39 +08:00
label_nodes commit before merging the code from https://walzer@github.com/cocos2d/cocos2d-x.git 2010-11-29 15:54:32 +08:00
layers_scenes_transitions_nodes fixed #251 CCKeypadDelegate implement 2010-12-13 14:10:39 +08:00
menu_nodes fixed #217 2010-11-23 15:15:07 +08:00
misc_nodes issue #211 cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
particle_nodes issue #211 cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
platform Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge 2010-12-13 17:55:02 +08:00
proj.uphone fixed #251 CCKeypadDelegate implement 2010-12-13 14:10:39 +08:00
proj.win32 fixed #251 CCKeypadDelegate implement 2010-12-13 14:10:39 +08:00
sprite_nodes fixed #248, crashed in CCSprite::setDisplayFrame 2010-12-10 10:31:14 +08:00
support Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2010-12-10 10:34:41 +08:00
textures fixed #215 2010-11-22 18:09:38 +08:00
tileMap_parallax_nodes commit before merging the code from https://walzer@github.com/cocos2d/cocos2d-x.git 2010-11-29 15:54:32 +08:00
touch_dispatcher issue #211 cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
Android.mk Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge 2010-12-13 17:55:02 +08:00
CCConfiguration.cpp issue #211 cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
CCConfiguration.h issue #211 cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
CCDirector.cpp Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge 2010-12-13 17:55:02 +08:00
CCDrawingPrimitives.cpp issue #211 cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
CCScheduler.cpp issue #220: All tests run on android emulator, but the effect of some tests are wrong 2010-12-06 09:51:21 +08:00
CCamera.cpp issue #211 cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
cocos2d.cpp issue #211 cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00