Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx
History
Ricardo Quesada d7590affda Merge branch 'develop' into dictionary_array_fixes 
Conflicts:
	cocos2dx/cocoa/CCArray.cpp
	cocos2dx/cocoa/CCArray.h
	cocos2dx/label_nodes/CCLabel.cpp
	extensions/CCArmature/datas/CCDatas.cpp
	extensions/CCArmature/display/CCDisplayManager.cpp
 		2013-08-21 21:27:44 -07:00
..
actions Merge branch 'develop' into dictionary_array_fixes 2013-08-21 21:27:44 -07:00
base_nodes Better destructors logs 2013-08-21 20:08:51 -07:00
cocoa Merge branch 'develop' into dictionary_array_fixes 2013-08-21 21:27:44 -07:00
draw_nodes Use explicit boolean compare instead of implicit float -> boolean conversion 2013-08-12 14:21:58 -07:00
effects Better destructors logs 2013-08-21 20:08:51 -07:00
include Merge remote-tracking branch 'originGithub/develop' into new_develop_merge_clean 2013-08-13 11:28:54 -07:00
kazmath Add new platform: CC_PLATFORM_QT5 2013-07-24 20:18:43 +02:00
keyboard_dispatcher fixed issues on win32 and mac keyboard 2013-07-02 11:39:18 +02:00
keypad_dispatcher CCAssert -> CCASSERT 2013-07-19 22:01:27 -07:00
label_nodes Merge branch 'develop' into dictionary_array_fixes 2013-08-21 21:27:44 -07:00
layers_scenes_transitions_nodes fix warnings caused by deprecating some functions of Array 2013-08-22 10:45:47 +08:00
menu_nodes fix warnings caused by deprecating some functions of Array 2013-08-22 10:45:47 +08:00
misc_nodes Use C++ code in C++ comments. 2013-08-01 16:40:56 +08:00
particle_nodes fix warnings caused by deprecating some functions of Array 2013-08-22 10:45:47 +08:00
platform Merge branch 'develop' into dictionary_array_fixes 2013-08-21 20:27:19 -07:00
proj.emscripten issue #2488: Updating project configurations for new Label classes. 2013-08-15 21:01:45 +08:00
proj.linux updata: [cocos2d's code style] add space before backslash and return before else if 2013-08-16 16:10:39 +08:00
proj.nacl issue #2430:move GLProgram enum into class 2013-07-25 17:48:22 +08:00
proj.qt5 Qt 5: Build fixes for Qt 5 platform 2013-08-01 09:20:17 +02:00
proj.tizen [Tizen] Update project files 2013-08-10 23:11:31 +09:00
proj.win32 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Atitc_decode 2013-08-16 11:14:47 +08:00
script_support issue #2344: ScriptEngineManager::sharedManager --> ScriptEngineManager::getInstance, ScriptEngineManager::purgeSharedManager --> ScriptEngineManager::destroyInstance 2013-07-22 17:24:54 +08:00
shaders Array & Dictionary fixes 2013-08-21 20:12:09 -07:00
sprite_nodes Merge branch 'develop' into dictionary_array_fixes 2013-08-21 21:27:44 -07:00
support Array & Dictionary fixes 2013-08-21 20:12:09 -07:00
text_input_node New Label stuff merged and Label::Alignment replaced with TextVAlignment and TextHAlignment 2013-07-26 16:04:21 -07:00
textures Array & Dictionary fixes 2013-08-21 20:12:09 -07:00
tilemap_parallax_nodes Merge branch 'develop' into dictionary_array_fixes 2013-08-21 21:27:44 -07:00
touch_dispatcher Array & Dictionary fixes 2013-08-21 20:12:09 -07:00
Android.mk updata: [cocos2d's code style] add space before backslash and return before else if 2013-08-16 16:10:39 +08:00
CCCamera.cpp issue #2462:use cocos2d-x c++ style 2013-08-08 16:31:44 +08:00
CCCamera.h issue #2462:use cocos2d-x c++ style 2013-08-08 16:31:44 +08:00
CCConfiguration.cpp issue #2533:add ATITC compressed texture support 2013-08-16 11:02:44 +08:00
CCConfiguration.h issue #2533:add ATITC compressed texture support 2013-08-16 11:02:44 +08:00
CCDeprecated.cpp Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345 2013-07-27 22:06:30 +08:00
CCDirector.cpp Merge branch 'develop' into dictionary_array_fixes 2013-08-21 21:27:44 -07:00
CCDirector.h issue #2462:use cocos2d-x c++ style 2013-08-08 16:31:44 +08:00
CCScheduler.cpp fix warnings caused by deprecating some functions of Array 2013-08-22 10:45:47 +08:00
CCScheduler.h Use C++ code in C++ comments. 2013-08-01 16:40:56 +08:00
ccFPSImages.c
…
ccFPSImages.h
…
ccTypes.cpp Constant fixes 2013-07-25 13:36:19 -07:00
cocos2d.cpp Fixes some warnings 2013-07-24 14:02:36 -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