Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx
History
James Chen 976d4ad11e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into remove-copywithzone 
Conflicts:
	cocos2dx/actions/CCActionInterval.cpp
	cocos2dx/cocoa/CCDictionary.cpp
	samples/Cpp/TestCpp/Classes/NodeTest/NodeTest.cpp
 		2013-07-09 09:48:41 +08:00
..
actions Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into remove-copywithzone 2013-07-09 09:48:41 +08:00
base_nodes issue #2129:use capital words for static const member variables 2013-07-08 18:11:32 +08:00
cocoa Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into remove-copywithzone 2013-07-09 09:48:41 +08:00
draw_nodes iss2129: bug fix in CCDrawNode.cpp 2013-07-08 15:15:22 +08:00
effects issue #2129: Windows doesn't support 'initializer list', using constructor instead. 2013-07-07 21:08:14 +08:00
include issue #2129:use capital words for static const member variables 2013-07-08 18:11:32 +08:00
kazmath Support Tizen device. 2013-06-12 10:20:18 +09:00
keyboard_dispatcher fixed issues on win32 and mac keyboard 2013-07-02 11:39:18 +02:00
keypad_dispatcher issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
label_nodes From C++ best practices 2013-07-08 14:38:14 -07:00
layers_scenes_transitions_nodes issue #2129:use capital words for static const member variables 2013-07-08 18:11:32 +08:00
menu_nodes issue #2129:use capital words for static const member variables 2013-07-08 18:11:32 +08:00
misc_nodes From C++ best practices 2013-07-08 14:38:14 -07:00
particle_nodes Merge branch 'iss2129-remove_prefix' of https://github.com/minggo/cocos2d-x into minggo-iss2129-remove_prefix 2013-07-08 10:51:07 +08:00
platform Merge branch 'iss2129-remove_prefix' of https://github.com/minggo/cocos2d-x into minggo-iss2129-remove_prefix 2013-07-06 15:19:09 +08: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.linux issue #2129:fix conflicts 2013-07-05 17:32:50 +08: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 issue #2129:fix conflicts 2013-07-05 17:32:50 +08:00
proj.tizen Fix compile error. 2013-06-20 19:20:27 +09:00
proj.win32 issue #2129: Windows doesn't support 'initializer list', using constructor instead. 2013-07-07 21:08:14 +08:00
script_support issue #2244:Modify ScriptData struct and functions related with sendEvent 2013-07-04 15:44:42 +08:00
shaders Adds const to more getters 2013-07-06 22:01:21 -07:00
sprite_nodes issue #2300: Removing all 'copyWithZone' pattern. 2013-07-08 23:05:47 +08:00
support Merge branch 'iss2129-remove_prefix' of https://github.com/minggo/cocos2d-x into minggo-iss2129-remove_prefix 2013-07-08 10:51:07 +08:00
text_input_node issue #2129:remove prefix of types in ccTypes.h 2013-07-05 16:49:22 +08:00
textures issue #2300: Warning fixes. 2013-07-08 23:12:11 +08:00
tilemap_parallax_nodes issue #2129: Windows doesn't support 'initializer list', using constructor instead. 2013-07-07 21:08:14 +08:00
touch_dispatcher issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
Android.mk issue #2129:fix conflicts 2013-07-05 17:32:50 +08:00
CCCamera.cpp Adds const to more getters 2013-07-06 22:01:21 -07:00
CCCamera.h Adds const to more getters 2013-07-06 22:01:21 -07: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 Adds const to more getters 2013-07-06 22:01:21 -07:00
CCDirector.h Adds const to more getters 2013-07-06 22:01:21 -07:00
CCScheduler.cpp issue #2244:Modify ScriptData struct and functions related with sendEvent 2013-07-04 15:44:42 +08:00
CCScheduler.h Adds const to more getters 2013-07-06 22:01:21 -07: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
ccTypes.cpp issue #2129:use capital words for static const member variables 2013-07-08 18:11:32 +08:00
cocos2d.cpp MenuItemToggle is fixed 2013-06-05 17:51:40 -07:00
cocos2dx-Prefix.pch issue #2371: Deleting cocos2dx/proj.ios and cocos2dx/proj.mac since it isn't needed anymore, moving the prefix header file to previous folder. 2013-07-05 10:52:46 +08:00