axmol/cocos2dx
dumganhar 8298e0b6ff Merge branch 'master' of https://github.com/styck/cocos2d-x into pullrequest#611
Conflicts:
	tests/test.marmalade/test.mkb
2011-12-15 13:03:07 +08:00
..
.settings add files include test and cocosDenshion 2011-08-19 14:43:19 +08:00
actions issue #892: use RTTI to simplify codes, work ok on win32 2011-12-07 14:28:22 +08:00
base_nodes issue #892: modify pkg for lua 2011-12-07 15:24:03 +08:00
cocoa Fixing Warning on CLang 3.0 on XCode 4.2 2011-12-15 01:46:55 +08:00
effects issue #879: replase assert with CCAssert 2011-11-28 17:28:43 +08:00
include #issue 908: Merge marmalade to latest cocos2d-x source 2011-12-12 17:46:21 +08:00
keypad_dispatcher issue #892: use RTTI to simplify codes, work ok on win32 2011-12-07 14:28:22 +08:00
label_nodes issue #892: use RTTI to simplify codes, work ok on win32 2011-12-07 14:28:22 +08:00
layers_scenes_transitions_nodes issue #892: use RTTI to simplify codes, work ok on win32 2011-12-07 14:28:22 +08:00
menu_nodes issue #892: use RTTI to simplify codes, work ok on win32 2011-12-07 14:28:22 +08:00
misc_nodes issue #879: replase assert with CCAssert 2011-11-28 17:28:43 +08:00
particle_nodes remove some '__QNX__' macros 2011-12-12 16:14:12 +08:00
platform Merge branch 'master' of https://github.com/styck/cocos2d-x into pullrequest#611 2011-12-15 13:03:07 +08:00
proj.bada remove some '__QNX__' macros 2011-12-12 16:14:12 +08:00
proj.linux fixed #850: update Box2d for linux 2011-11-29 17:12:21 +08:00
proj.marmalade Merged from gitbub.gom/gzito, marmalade support, remove airplay 2011-12-10 20:59:48 -08:00
proj.qnx Merge branch 'dev' of https://github.com/guavagames/cocos2d-x into pullrequest#619 2011-12-15 11:36:42 +08:00
proj.win32 issue #892: use RTTI to simplify codes, work ok on win32 2011-12-07 14:28:22 +08:00
proj.wophone Merge branch 'master' of https://github.com/jbyu/cocos2d-x 2011-11-15 14:00:52 +08:00
script_support [win32] fixed #620: change the output of lua to a lib 2011-07-20 15:21:51 +08:00
sprite_nodes issue #892: use RTTI to simplify codes, work ok on win32 2011-12-07 14:28:22 +08:00
support Fixing Warning on CLang 3.0 on XCode 4.2 2011-12-15 01:46:55 +08:00
text_input_node Non-trivial arguments passed by reference now. 2011-08-17 17:26:26 +04:00
textures fixed #854: cache texture on android 2011-12-01 17:04:56 +08:00
tileMap_parallax_nodes Fixing Warning on CLang 3.0 on XCode 4.2 2011-12-15 01:46:55 +08:00
touch_dispatcher issue #892: use RTTI to simplify codes, work ok on win32 2011-12-07 14:28:22 +08:00
Android.mk fixed #838: tests and HelloLua support x86 2011-11-23 15:51:30 +08:00
CCCamera.cpp issue #879: replase assert with CCAssert 2011-11-28 17:28:43 +08:00
CCConfiguration.cpp Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into bada 2011-09-29 16:03:37 +08:00
CCConfiguration.h modified: cocos2dx/.cproject 2011-08-23 11:28:04 +08:00
CCDirector.cpp Merge branch 'master' of https://github.com/gzito/cocos2d-x into marmalade 2011-12-13 10:01:29 +08:00
CCDrawingPrimitives.cpp issue #879: replase assert with CCAssert 2011-11-28 17:28:43 +08:00
CCScheduler.cpp fix a bug when COCOS2D_DEBUG >=1, CCAssert haven't the second param. 2011-11-30 09:32:07 +08:00
cocos2d.cpp support for android 4.0 2011-11-30 15:30:11 +08:00