axmol/cocos2dx
James Chen 05bf647ec3 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss984_bada_qnx_static_lib 2012-02-28 15:00:18 +08:00
..
actions merge upstream/master 2012-02-06 10:54:51 +08:00
base_nodes * add CCScriptSupport 2012-02-09 14:07:11 +08:00
cocoa * add CCScriptSupport 2012-02-09 14:07:11 +08:00
effects move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
extensions issue #972: move extensions folder to cocos2dx 2012-02-14 16:08:12 +08:00
include add commet for CCArray 2012-02-23 10:06:36 +08:00
keypad_dispatcher move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
label_nodes move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
layers_scenes_transitions_nodes merge from cocos2d-x master 2012-02-10 10:46:58 +08:00
menu_nodes * add CCScriptSupport 2012-02-09 14:07:11 +08:00
misc_nodes move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
particle_nodes move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
platform Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss984_bada_qnx_static_lib 2012-02-28 15:00:18 +08:00
proj.bada fixed #984: Use static library for cocos2dx project on platforms(bada and qnx) that use gcc compiler. Because dynamic_cast may fail if you use a gcc compiler. 2012-02-28 14:59:46 +08:00
proj.linux update linux project configure 2012-02-15 15:57:09 +08:00
proj.marmalade modify marmalade project setting 2012-02-14 18:25:20 +08:00
proj.qnx fixed #984: Use static library for cocos2dx project on platforms(bada and qnx) that use gcc compiler. Because dynamic_cast may fail if you use a gcc compiler. 2012-02-28 14:59:46 +08:00
proj.win32 rename Resource(in HelloLua and HelloWorld project) and Res(in tests project) to Resources. 2012-02-14 18:04:56 +08:00
proj.wophone Merge branch 'master' of https://github.com/jbyu/cocos2d-x 2011-11-15 14:00:52 +08:00
script_support fix CCScriptEngineManager::purgeSharedManager() 2012-02-09 20:07:55 +08:00
sprite_nodes move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
support issue #972: move extensions folder to cocos2dx 2012-02-14 16:08:12 +08:00
text_input_node move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
textures fixed #967: fixed PVR Textures can not be reloaded after GL context lost on android. 2012-02-07 11:18:39 +08:00
tileMap_parallax_nodes move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
touch_dispatcher issue #971: build cocos2dx as static lib and remove some unneeded codes 2012-02-09 15:49:14 +08:00
Android.mk rename Resource(in HelloLua and HelloWorld project) and Res(in tests project) to Resources. 2012-02-14 18:04:56 +08:00
CCCamera.cpp move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
CCConfiguration.cpp move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
CCConfiguration.h move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
CCDirector.cpp fixed #946: HD image for both retina and normal 2012-02-16 10:47:16 +08:00
CCDrawingPrimitives.cpp move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
CCScheduler.cpp * add CCScriptSupport 2012-02-09 14:07:11 +08:00
cocos2d.cpp fixed #985: remove xcode3 template 2012-02-28 10:21:59 +08:00