axmol/cocos2dx
YuLei Liao 9c7826e716 Merge remote-tracking branch 'refs/remotes/upstream/master' into luafix-master 2012-02-02 15:58:22 +08:00
..
.settings add files include test and cocosDenshion 2011-08-19 14:43:19 +08:00
actions * fix some issues 2012-02-02 15:58:10 +08:00
base_nodes * fix some issues 2012-02-02 15:58:10 +08:00
cocoa * add Lua object reference ID to CCObject 2012-02-02 10:38:04 +08:00
effects issue #879: replase assert with CCAssert 2011-11-28 17:28:43 +08:00
include Merge remote-tracking branch 'refs/remotes/upstream/master' into luafix-master 2012-02-02 15:58:22 +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 fixed 952: make CCLabelBMFont support other language, such as chinese, korean, japanese. 2012-01-18 18:43:41 +08:00
layers_scenes_transitions_nodes * fix some issues 2012-02-02 15:58:10 +08:00
menu_nodes * fix some issues 2012-02-02 15:58:10 +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 * add macro defines for Lua engine 2012-02-02 10:37:21 +08:00
proj.bada fixed #918: modify filter of airplay to marmalade. 2011-12-16 11:08:37 +08:00
proj.linux modify eclipse project setting for linux port 2012-01-12 19:15:23 +08:00
proj.marmalade Added Marmalade support to TextInputTest and HelloLua samples 2012-01-15 15:57:10 +01: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 remove selector_protocol.h for vs2010 project 2012-01-30 18:27:03 +08:00
proj.wophone Merge branch 'master' of https://github.com/jbyu/cocos2d-x 2011-11-15 14:00:52 +08:00
sprite_nodes modify construct and destruct function of some class, for example CCNode() --> CCNode.cpp(void) 2012-01-09 23:21:31 +08:00
support fixed #933: free doc 2012-02-02 14:24:51 +08:00
text_input_node Non-trivial arguments passed by reference now. 2011-08-17 17:26:26 +04:00
textures move SelectorProtocol to CCObject 2012-01-08 21:03:16 +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 remove some logs 2012-01-30 15:46:56 +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' into moveSel2CCObject 2012-01-19 15:46:31 +08:00
CCDrawingPrimitives.cpp issue #879: replase assert with CCAssert 2011-11-28 17:28:43 +08:00
CCScheduler.cpp * fix some issues 2012-02-02 15:58:10 +08:00
cocos2d.cpp modify version 2012-01-11 15:17:16 +08:00