axmol/cocos2dx
James Chen 80cb06d3f7 Merge branch 'minggo-iss2305-replace-pthread' of https://github.com/dumganhar/cocos2d-x into minggo-iss2305-replace-pthread 2013-06-24 10:01:57 +08:00
..
actions issue #2322: Action now is inherited from Object and Clonable now. 2013-06-23 17:22:23 +08:00
base_nodes Typo fixes in CCNode.h. 2013-06-21 13:47:29 +08:00
cocoa issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
draw_nodes issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
effects issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
include issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
kazmath Support Tizen device. 2013-06-12 10:20:18 +09:00
keyboard_dispatcher issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
keypad_dispatcher issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
label_nodes issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
layers_scenes_transitions_nodes [WIN32] NULL --> nullptr for CCLayer.cpp. 2013-06-20 18:01:53 +08:00
menu_nodes issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
misc_nodes issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
particle_nodes issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
platform Merge branch 'minggo-iss2305-replace-pthread' of https://github.com/dumganhar/cocos2d-x into minggo-iss2305-replace-pthread 2013-06-24 10:01:57 +08:00
proj.blackberry Updating project configuration for Blackberry port. 2013-06-07 16:52:49 +08:00
proj.emscripten fixed #2301: Merge branch 'emscriptenate' of https://github.com/j4m3z0r/cocos2d-x into j4m3z0r-emscriptenate 2013-06-19 13:03:51 +08:00
proj.ios issue #2304:use function to simplify acceremeter call back 2013-06-19 16:10:53 +08:00
proj.linux issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
proj.mac issue #2284: fix bugs after merging master 2013-06-14 14:34:50 +08:00
proj.marmalade 1. add Component struct. 2013-06-04 17:38:43 +08:00
proj.nacl [NaCl] Add support for building using glibc toolchain. 2013-06-20 12:56:14 -07:00
proj.tizen Fix compile error. 2013-06-20 19:20:27 +09:00
proj.win32 closed #2322: Updating all win32 project configurations, improvement by using Multi-processor Compilation. 2013-06-23 17:25:34 +08:00
script_support issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
shaders issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
sprite_nodes issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
support Merge branch 'develop' of z:/Project/cocos2d-x into develop 2013-06-20 17:38:23 +08:00
text_input_node issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
textures issue #2305: tab -> 4 spaces 2013-06-21 15:49:45 +08:00
tilemap_parallax_nodes issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
touch_dispatcher issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
Android.mk issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
CCCamera.cpp issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCCamera.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCConfiguration.cpp issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCConfiguration.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCDirector.cpp issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCDirector.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCScheduler.cpp issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCScheduler.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
ccFPSImages.c issue 2217: Removing unused fps_image png data. 2013-05-23 16:04:40 +08:00
ccFPSImages.h issue 2217: Removing unused fps_image png data. 2013-05-23 16:04:40 +08:00
cocos2d.cpp MenuItemToggle is fixed 2013-06-05 17:51:40 -07:00