minggo 9d8f0f4b17 Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master		2011-01-21 18:18:13 +08:00
..
actions	modify YES to true,and No to false.	2010-12-31 17:56:46 +08:00
base_nodes	Merge branch 'iss295' into upto-0.99.5	2010-12-31 09:48:48 +08:00
cocoa	fix bug in CGRect::CGRectIntersectsRect(..) method, CGGeometry.cpp, according to this solution http://www.cocos2d-x.org/boards/6/topics/387	2011-01-21 08:54:45 +08:00
effects	fixed #292	2010-12-29 18:01:37 +08:00
event_dispatcher	issue #289, fix some warnings	2011-01-17 21:16:25 +08:00
include	fixed #306, invoke CCDirector::end() method in next msgloop, otherwise the flow will crashes when end() is called in an ActionInterval.	2011-01-17 22:01:15 +08:00
keypad_dispatcher	[uphone] add keyMenuBack to CCKeypadDelegate	2010-12-31 18:15:30 +08:00
label_nodes	remove the usage of YES and NO	2010-12-31 16:37:00 +08:00
layers_scenes_transitions_nodes	update layers_scenes_transition_nodes to 0.99.5.	2010-12-25 18:07:34 +08:00
menu_nodes	Fix bugs.Run tests in cocos2d-uphone successful.	2011-01-05 17:01:08 +08:00
misc_nodes	Fix bugs.Run HelloWorld and tests in cocos2d-win32 successful.	2011-01-06 14:04:03 +08:00
particle_nodes	fix the wrong direction of particle system	2011-01-20 10:21:41 +08:00
platform	Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master	2011-01-21 18:18:13 +08:00
proj.uphone	[uphone] add CCNS_uphone.cpp into Makefile.ARM	2011-01-12 17:35:53 +08:00
proj.win32	Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master	2011-01-17 20:37:23 +08:00
sprite_nodes	Fix bugs.Run tests in cocos2d-uphone successful.	2011-01-05 17:01:08 +08:00
support	HelloWorld runs ok on iphone	2011-01-07 11:27:42 +08:00
textures	issue #289, fix some warnings	2011-01-17 21:16:25 +08:00
tileMap_parallax_nodes	modify YES to true,and No to false.	2010-12-31 17:56:46 +08:00
touch_dispatcher	issue #211 cocos2d-x back to cocos2dx	2010-11-18 15:01:42 +00:00
Android.mk	fixed #309,App will not crash any more when surface re-created.	2011-01-10 17:54:44 +08:00
CCConfiguration.cpp	issue #211 cocos2d-x back to cocos2dx	2010-11-18 15:01:42 +00:00
CCConfiguration.h	issue #292	2010-12-28 15:05:55 +08:00
CCDrawingPrimitives.cpp	issue #292	2010-12-28 15:05:55 +08:00
CCScheduler.cpp	Merge remote branch 'remotes/origin/upto-0.99.5' Fix some conflicts manually.	2011-01-17 16:21:11 +08:00
CCamera.cpp	issue #292	2010-12-28 15:05:55 +08:00
cocos2d.cpp	issue #292	2010-12-28 15:05:55 +08:00