axmol/cocos2dx
James Chen fc2fd4d353 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-03-22 09:46:23 +08:00
..
actions issue #1056: Remove CCMutableArray and CCMutableDictionary template, offer CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost. 2012-03-20 15:04:53 +08:00
base_nodes issue #1056: Added CCArray::copyWithZone implementation. CCDictElement bound check. 2012-03-20 23:30:18 +08:00
cocoa issue #1056: Remove CCMutableArray and CCMutableDictionary template, offer CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost. 2012-03-20 15:04:53 +08:00
effects issue #1056: synchronise cocos2d-iphone-2.0-rc0a 2012-03-16 13:42:53 +08:00
extensions issue #1056: Remove CCMutableArray and CCMutableDictionary template, offer CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost. 2012-03-20 15:04:53 +08:00
include Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-03-22 09:46:23 +08:00
kazmath issue #1056: 1. Removed ChipmunkTest, added ChipmunkAccelTouchTest. 2012-03-21 15:43:35 +08:00
keypad_dispatcher issue #1056: Move some singletons to CCDirector. It is easily managed by CCDirector. 2012-03-21 17:35:20 +08:00
label_nodes issue #1056: Update CCLabelBMFont. 2012-03-22 09:46:07 +08:00
layers_scenes_transitions_nodes issue #1056: Move some singletons to CCDirector. It is easily managed by CCDirector. 2012-03-21 17:35:20 +08:00
menu_nodes issue #1056: Move some singletons to CCDirector. It is easily managed by CCDirector. 2012-03-21 17:35:20 +08:00
misc_nodes issue #1056: implement ActionsProgressTest and run ok on win32 2012-03-19 18:20:32 +08:00
particle_nodes issue #1056: 1.Fixed a bug of double delete TouchDispatcher. 2012-03-21 21:53:03 +08:00
platform issue #1056: Update Android.mk. Make tests project being compiled successfully. 2012-03-21 22:49:58 +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 Fixed a typo: CCAplication_linux.{cpp,h} renamed in CCApplication_linux.{cpp,h} 2012-03-12 14:22:39 +01: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 issue #1056: Remove old files(CCMutableArray, CCMutableDictionary) reference in vc2008 project. 2012-03-20 21:08:52 +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 m_nEntryID typo for CC_LUA_ENGINE_DEBUG 2012-03-12 00:59:03 +04:00
shaders Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into android_gles20 2012-03-20 16:10:53 +08:00
sprite_nodes issue #1056: 1. Removed ChipmunkTest, added ChipmunkAccelTouchTest. 2012-03-21 15:43:35 +08:00
support issue #1056: Added CCArray::copyWithZone implementation. CCDictElement bound check. 2012-03-20 23:30:18 +08:00
text_input_node move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
textures issue #1056: 1.Fixed a bug of double delete TouchDispatcher. 2012-03-21 21:53:03 +08:00
tileMap_parallax_nodes issue #1056: Remove CCMutableArray and CCMutableDictionary template, offer CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost. 2012-03-20 15:04:53 +08:00
touch_dispatcher issue #1056: Move some singletons to CCDirector. It is easily managed by CCDirector. 2012-03-21 17:35:20 +08:00
Android.mk issue #1056: modify code according new code after pull 2012-03-20 17:27:06 +08:00
CCCamera.cpp issue #1056: synchronise cocos2d-iphone gles2.0 branch, HelloWorld on win32 works ok. 2012-03-14 14:55:17 +08:00
CCConfiguration.cpp issue #1056: synchronise cocos2d-iphone gles2.0 branch, HelloWorld on win32 works ok. 2012-03-14 14:55:17 +08:00
CCConfiguration.h issue #1056: synchronise cocos2d-iphone gles2.0 branch, HelloWorld on win32 works ok. 2012-03-14 14:55:17 +08:00
CCDirector.cpp issue #1056: Move some singletons to CCDirector. It is easily managed by CCDirector. 2012-03-21 17:35:20 +08:00
CCDrawingPrimitives.cpp issue #1056: synchronise cocos2d-iphone-2.0-rc0a 2012-03-16 13:42:53 +08:00
CCScheduler.cpp issue #1056: Remove CCMutableArray and CCMutableDictionary template, offer CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost. 2012-03-20 15:04:53 +08:00
cocos2d.cpp fixed #985: remove xcode3 template 2012-02-28 10:21:59 +08:00