axmol/cocos2dx
minggo f3126de646 Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master 2010-12-09 13:59: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 fixed #226 add support read resource file from zip file in cocos2d-uphone 2010-11-29 10:49:43 +08:00
effects issue #211 cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
include add CCLOG support on win32 and uphone 2010-11-23 18:20:46 +08:00
label_nodes 1. Check the return value of FileData::getFileData() 2010-11-29 14:21:33 +08:00
layers_scenes_transitions_nodes issue #211 cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00: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/yangws/cocos2d-x into yangws-master 2010-12-09 13:59:02 +08:00
proj.uphone fixed #236 Fix the bug of cross-compile in cocos2d-uphone 2010-12-03 11:08:30 +08:00
proj.win32 fixed #226 add support read resource file from zip file in cocos2d-uphone 2010-11-29 10:49:43 +08:00
sprite_nodes issue #211 cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
support fixed #236 Fix the bug of cross-compile in cocos2d-uphone 2010-12-03 11:08:30 +08:00
textures fixed #215 2010-11-22 18:09:38 +08:00
tileMap_parallax_nodes 1. Check the return value of FileData::getFileData() 2010-11-29 14:21:33 +08:00
touch_dispatcher issue #211 cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
Android.mk Remove unneeded predefined macro _ADNROID, because ndk build chain has already defined a macro named ANDROID 2010-11-23 18:02:42 +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 issue #211 cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
CCDrawingPrimitives.cpp issue #211 cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
CCScheduler.cpp issue #211 cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00: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