axmol/cocos2dx
samuele3hu c5e5c49332 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into execDev 2013-07-04 09:52:28 +08:00
..
actions issue #22434:make some execute funs into one funs in ScriptEngineProtocol 2013-07-02 15:23:51 +08:00
base_nodes issue #2244:Add some constructor 2013-07-03 14:19:00 +08:00
cocoa Merge pull request #3063 from dumganhar/DarraghCoy-selector_cast_safety 2013-07-03 01:09:09 -07:00
draw_nodes Add ccDrawSolidCircle 2013-07-02 13:39:16 -07: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 Fixing errors on windows. 2013-07-01 18:22:09 +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 issue #2244:Add some constructor 2013-07-03 14:19:00 +08:00
menu_nodes issue #22434:make some execute funs into one funs in ScriptEngineProtocol 2013-07-02 15:23:51 +08:00
misc_nodes issue #2285: ccColor3B --> const ccColor3B& for MotionStreak::create. 2013-07-02 17:46:45 +08:00
particle_nodes issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
platform - Fixing shadows for text with stroke in iOS 2013-07-02 22:45:07 +01:00
proj.blackberry Updating project configuration for Blackberry port. 2013-06-07 16:52:49 +08:00
proj.emscripten 1. Add C++ code to decode ETC file 2013-07-01 17:40:57 +08:00
proj.ios Merge branch 'origin/develop' 2013-07-02 13:47:02 +08:00
proj.linux Merge branch 'origin/develop' 2013-07-02 13:47:02 +08:00
proj.mac cocos2d-x in Mac: 2013-06-28 19:02:10 -07:00
proj.marmalade issue #2347: Compiled ok for android, marmalade and nacl, windows needs to be tested too. 2013-07-01 17:35:51 +08:00
proj.nacl Merge branch 'origin/develop' 2013-07-02 13:47:02 +08:00
proj.tizen Fix compile error. 2013-06-20 19:20:27 +09:00
proj.win32 adjust cocos2d.vcxproj.filters 2013-07-02 14:09:01 +08:00
script_support issue #2244:Add some constructor 2013-07-03 14:19:00 +08:00
shaders issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
sprite_nodes issue #2359: Using PositionColor shader when texture is NULL in Sprite. 2013-07-03 23:34:45 +08:00
support issue #22434:make some execute funs into one funs in ScriptEngineProtocol 2013-07-02 15:23:51 +08:00
text_input_node issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
textures issue #2328 refractor etc support: 2013-07-02 15:36:47 +08:00
tilemap_parallax_nodes closed #2346: use shader program to set uniform 2013-07-01 16:02:46 +08:00
touch_dispatcher issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
Android.mk Merge branch 'origin/develop' 2013-07-02 13:47:02 +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 #2328 refractor etc support: 2013-07-02 15:36:47 +08:00
CCConfiguration.h 1. Add C++ code to decode ETC file 2013-07-01 17:40:57 +08:00
CCDirector.cpp closed #2347: Macros like CC_KEYBOARD_SUPPORT should not be in header file. 2013-07-01 16:48:42 +08:00
CCDirector.h closed #2347: Keyboard is supported from cocos2d-x 3.0. 2013-07-01 17:15:49 +08:00
CCScheduler.cpp issue #2244:Add some constructor 2013-07-03 14:19:00 +08:00
CCScheduler.h Fixed Bug#2327:CCNode::isScheduled() is not implemented 2013-06-27 12:05:47 +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