axmol/cocos2dx
James Chen 8ba46c574a fix for conflict of project.pbxproj. 2013-02-28 13:37:45 +08:00
..
actions issue #1686: sync to CCLayer 2013-02-27 09:38:30 +08:00
base_nodes fixed #1686:finish updating 2013-02-28 11:55:36 +08:00
cocoa issue #1687: Moving the global function( ccFileUtils_dictionaryWithContentsOfFileThreadSafe, ccFileUtils_arrayWithContentsOfFileThreadSafe) to the CCFileUtils class. 2013-02-01 18:48:44 +08:00
draw_nodes issue #1686: sync to CCLayer 2013-02-27 09:38:30 +08:00
effects issue #1686: sync to CCLayer 2013-02-27 09:38:30 +08:00
include Merge branch 'iss1686-synchronize' of https://github.com/minggo/cocos2d-x into iss1686-synchronize 2013-02-28 13:01:45 +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 'iss1686-synchronize' of https://github.com/minggo/cocos2d-x into iss1686-synchronize 2013-02-28 13:01:45 +08:00
layers_scenes_transitions_nodes fixed #1686:finish updating 2013-02-28 11:55:36 +08:00
menu_nodes issue #1686:synchronize CCMenu.cpp 2013-02-28 10:15:09 +08:00
misc_nodes issue #1686:synchronize CCMenuItem.cpp 2013-02-27 17:23:39 +08:00
particle_nodes fixed #1686:finish updating 2013-02-28 11:55:36 +08:00
platform fixed #1637:fix mac retina display and labelttf 2013-02-27 11:10:42 +08:00
proj.blackberry issue #1712: Updating project setting for blackberry. 2013-02-17 16:26:08 +08:00
proj.ios fix for conflict of project.pbxproj. 2013-02-28 13:37:45 +08:00
proj.linux fixed #1753: Adding ccUTF8.h/.cpp for MAC, LINUX and MARMALADE port. 2013-02-28 09:44:37 +08:00
proj.mac fixed #1753: Adding ccUTF8.h/.cpp for MAC, LINUX and MARMALADE port. 2013-02-28 09:44:37 +08:00
proj.marmalade fixed #1753: Adding ccUTF8.h/.cpp for MAC, LINUX and MARMALADE port. 2013-02-28 09:44:37 +08:00
proj.win32 issue #1753: Win32 works ok. 2013-02-27 15:45:23 +08:00
script_support add CCLuaObjcBridge 2013-02-02 02:05:52 +08:00
shaders issue #1686: sync to CCLayer 2013-02-27 09:38:30 +08:00
sprite_nodes issue #1686:synchronize CCSprite.cpp 2013-02-27 15:30:49 +08:00
support fixed #1753: Android works ok now. 2013-02-27 16:57:36 +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 #1686:synchronize CCTextureCache.cpp 2013-02-27 11:35:38 +08:00
tilemap_parallax_nodes fixed #1686:finish updating 2013-02-28 11:55:36 +08:00
touch_dispatcher fixed #1593:remove all deprecated methods expect CCBAnimationManager 2012-12-06 18:51:33 +08:00
Android.mk fixed #1753: Android works ok now. 2013-02-27 16:57:36 +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 fixed #1686:finish updating 2013-02-28 11:55:36 +08:00
CCDirector.h fixed #1686:finish updating 2013-02-28 11:55:36 +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
ccFPSImages.c.REMOVED.git-id issue #1686: sync to CCLayer 2013-02-27 09:38:30 +08:00
ccFPSImages.h issue #1686: sync to CCLayer 2013-02-27 09:38:30 +08:00
cocos2d.cpp issue #1686:synchronize cocos2d.cpp 2013-02-26 16:55:23 +08:00