axmol/cocos2dx
yangws 8458476597 Merge branch 'dev' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
Conflicts:
	.gitignore
2011-02-12 16:42:47 +08:00
..
actions add platform support project on win32. 2011-01-15 18:05:35 +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 add platform support project on win32. 2011-01-15 18:05:35 +08:00
event_dispatcher Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 2011-01-20 11:18:35 +08:00
include Merge branch 'dev' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 2011-02-12 16:42:47 +08:00
keypad_dispatcher Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 2011-01-20 11:18:35 +08:00
label_nodes fix bug,MenuTest crash. 2011-01-28 16:05:21 +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 move CCXBitmapDC from cocos2d/platform to platform_support. 2011-01-19 14:23:26 +08:00
particle_nodes Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 2011-01-28 14:33:47 +08:00
platform Merge branch 'dev' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 2011-02-12 16:42:47 +08:00
proj.uphone [uphone] add CCNS_uphone.cpp into Makefile.ARM 2011-01-12 17:35:53 +08:00
proj.win32 Move win32/CCXApplication to platform_support 2011-01-22 16:24:54 +08:00
sprite_nodes add platform support project on win32. 2011-01-15 18:05:35 +08:00
support add platform support project on win32. 2011-01-15 18:05:35 +08:00
textures Change prefix CCX to ccx. 2011-01-27 17:07:36 +08:00
tileMap_parallax_nodes add platform support project on win32. 2011-01-15 18:05:35 +08:00
touch_dispatcher add platform support project on win32. 2011-01-15 18:05:35 +08: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 branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 2011-01-20 11:18:35 +08:00
CCamera.cpp add platform support project on win32. 2011-01-15 18:05:35 +08:00
cocos2d.cpp issue #292 2010-12-28 15:05:55 +08:00