axmol/cocos2dx
yangws 814b66b089 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 396 2011-03-28 11:11:50 +08:00
..
actions issue #148, add copyright 2011-03-19 10:34:26 +08:00
base_nodes fixed #430 Solved bug by replacing glColor4ub with glColor4f. 2011-03-25 13:50:57 +08:00
cocoa fixed #409: rename NSArray UIAlignment 2011-03-18 14:31:29 +08:00
effects issue #148, add copyright 2011-03-19 10:34:26 +08:00
event_dispatcher issue #148, add copyright 2011-03-19 10:34:26 +08:00
include Merge branch 'issue427' 2011-03-25 13:45:49 +08:00
keypad_dispatcher issue #375: rename file names and object names 2011-03-07 17:11:57 +08:00
label_nodes issue #396 win32 modifyed. 2011-03-28 10:44:14 +08:00
layers_scenes_transitions_nodes fixed #418, add copyright of original authors, merge Bin's commit 2011-03-19 14:45:51 +08:00
menu_nodes fixed #418, add copyright of original authors, merge Bin's commit 2011-03-19 14:45:51 +08:00
misc_nodes fixed #430 Solved bug by replacing glColor4ub with glColor4f. 2011-03-25 13:50:57 +08:00
particle_nodes issue #418 add copyright of original authors to particle module 2011-03-19 10:07:16 +08:00
platform Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 396 2011-03-28 11:11:50 +08:00
proj.win32 add new files to vc2010 project. 2011-03-25 17:41:54 +08:00
proj.wophone issue #427 projct configs for win32-vs2008, wophone emu & device are ok 2011-03-25 11:23:21 +08:00
sprite_nodes fix compilation error when COCOS2D_DEBUG = 2 2011-03-21 10:50:24 +08:00
support issue #379, fix a bug caused by airplay port integration, which makes android port unable to load resources by zlib. 2011-03-26 14:09:42 +08:00
textures issue #396 android modified. 2011-03-28 11:09:49 +08:00
tileMap_parallax_nodes typo fixed, sorry :( 2011-03-25 16:13:18 +08:00
touch_dispatcher fixed #418, add copyright of original authors, merge Bin's commit 2011-03-19 14:45:51 +08:00
Android.mk issue #379, fix a bug caused by airplay port integration, which makes android port unable to load resources by zlib. 2011-03-26 14:09:42 +08:00
CCCamera.cpp fixed #418, add copyright of original authors, merge Bin's commit 2011-03-19 14:45:51 +08:00
CCConfiguration.cpp fixed #418, add copyright of original authors, merge Bin's commit 2011-03-19 14:45:51 +08:00
CCConfiguration.h fixed #418, add copyright of original authors, merge Bin's commit 2011-03-19 14:45:51 +08:00
CCDrawingPrimitives.cpp fixed #418, add copyright of original authors, merge Bin's commit 2011-03-19 14:45:51 +08:00
CCScheduler.cpp fixed #418, add copyright of original authors, merge Bin's commit 2011-03-19 14:45:51 +08:00
cocos2d.cpp fixed #418, add copyright of original authors, merge Bin's commit 2011-03-19 14:45:51 +08:00