axmol/cocos2dx
James Chen dcf1127d31 Merge branch 'master' into refactor-ccfileutils 2013-01-24 11:21:23 +08:00
..
actions Fixed memory leaks in CCActionCatmullRom class. 2013-01-23 14:38:46 +08:00
base_nodes Fixed a typo, and regenerated luabinding codes. 2013-01-23 15:59:13 +08:00
cocoa fixed #1468: Exported CCPoint, CCSize and CCRect. 2013-01-15 18:59:35 +08:00
draw_nodes Make sure HelloCpp can be full screen. 2012-11-29 16:31:29 +08:00
effects Added stackable action support. Exchanged the order of action. 2012-12-26 18:59:31 +08:00
include fix typos in doxygen of CCSprite and CCProtocol 2013-01-14 21:51:47 +08:00
kazmath Marmalade Cocos2d-x Main Repo Changes 2012-10-19 16:38:58 +01:00
keypad_dispatcher Minor English Spelling Corrections. A few grammar corrections. 2012-09-17 00:02:24 -07:00
label_nodes Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2013-01-14 17:07:07 +08:00
layers_scenes_transitions_nodes repair CCTransitionSplitCols & CCTransitionSplitRows 2013-01-15 00:49:05 +04:00
menu_nodes Fixed a CCMenu bug that prevented the touch priority from being set to the value specified by a call to CCMenu::setTouchPriority(int). 2013-01-23 14:00:23 -05:00
misc_nodes fixed #1649: Changed return type to const reference for member variable access. 2013-01-14 15:51:53 +08:00
particle_nodes fixed #1662: Getting full path will fail if texture name in the plist is without relative path. 2013-01-17 11:42:41 +08:00
platform issue #1661: CrystalCraze works ok on android. 2013-01-24 00:32:22 +08:00
proj.blackberry Removing grskia dependancy and adding in freetype support to the builds. 2013-01-02 18:53:31 -05:00
proj.ios use macro CC_TARGET_OS_IPHONE instead of TARGET_OS_IPHONE and make xcode template work ok 2012-11-26 15:08:40 +08:00
proj.linux Fix for 32bit. 2013-01-22 18:30:16 +08:00
proj.mac use macro CC_TARGET_OS_IPHONE instead of TARGET_OS_IPHONE and make xcode template work ok 2012-11-26 15:08:40 +08:00
proj.marmalade create cocos2dx-ext marmalade project 2012-11-26 20:14:10 +01:00
proj.win32 Detect VS2012 Update 1 2013-01-10 11:55:30 +01:00
script_support CCAssert uses CC_ASSERT directly 2013-01-10 12:26:12 -08:00
shaders fixed #1593:remove all deprecated methods expect CCBAnimationManager 2012-12-06 18:51:33 +08:00
sprite_nodes Added filename lookup support for win32. 2013-01-18 21:54:48 +08:00
support issue #1603: fixed a warning in unzip.cpp. 2012-12-20 18:39:29 +08:00
text_input_node fixed #1649: Changed return type to const reference for member variable access. 2013-01-14 15:51:53 +08:00
textures issue #1667: Adding file name lookup support for iOS and Android, TBD: Other platform supports. 2013-01-18 18:05:32 +08:00
tilemap_parallax_nodes fixed #1649: Reverted some invokings of function that returns const reference. 2013-01-14 16:06:18 +08:00
touch_dispatcher fixed #1593:remove all deprecated methods expect CCBAnimationManager 2012-12-06 18:51:33 +08:00
Android.mk fix android compile warning 2012-12-14 18:01:54 +08:00
CCCamera.cpp issue #1555:build ok on android 2012-11-16 14:23:14 +08:00
CCCamera.h update copyright to 2012, update cocos2d version to 2.0.3 2012-09-24 21:22:20 +08:00
CCConfiguration.cpp Merge with gles20. 2012-06-11 10:43:07 -07:00
CCConfiguration.h add groups to all classes for doxygen 2012-06-20 18:09:11 +08:00
CCDirector.cpp fix compile error for ios/mac c++11 2012-12-10 18:10:41 +08:00
CCDirector.h issue #1555:fix a bug about CCGLProgram 2012-11-13 11:06:32 +08:00
CCScheduler.cpp fix a compilation error for android. 2013-01-03 19:56:34 +08:00
CCScheduler.h issue #1555:update to v2.1 beta3 2012-11-14 18:05:15 +08:00
cocos2d.cpp issue #1555:update to v2.1 beta3 2012-11-14 18:05:15 +08:00