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 e0523b3438 Merge branch 'developNewLabelForRiq' into label_merge 
Conflicts:
	cocos2dx/textures/CCTexture2D.h
	samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp
	scripting/javascript/bindings/generated
	tools/bindings-generator
 		2013-07-24 15:15:08 -07:00
..
actions More best practices fixes and other bug fixes 2013-07-23 15:20:22 -07:00
base_nodes issue #2378: More override functions. 2013-07-23 21:51:19 +08:00
cocoa More best practices fixes and other bug fixes 2013-07-23 15:20:22 -07:00
draw_nodes CCAssert -> CCASSERT 2013-07-19 22:01:27 -07:00
effects issue #2412:fix merging conflict 2013-07-23 10:41:11 +08:00
include Merge branch 'developNewLabelForRiq' into label_merge 2013-07-24 15:15:08 -07: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 CCAssert -> CCASSERT 2013-07-19 22:01:27 -07:00
label_nodes Merge branch 'developNewLabelForRiq' into label_merge 2013-07-24 15:15:08 -07:00
layers_scenes_transitions_nodes issue #2378: More override functions. 2013-07-23 21:51:19 +08:00
menu_nodes More best practices fixes and other bug fixes 2013-07-23 15:20:22 -07:00
misc_nodes issue #2378: inline function are in header files now. 2013-07-23 20:36:41 +08:00
particle_nodes issue #2378: Mark ParticleSystem::getOpacityModifyRGB as deprecated. 2013-07-23 20:44:42 +08:00
platform Merge branch 'developNewLabelForRiq' into label_merge 2013-07-24 15:15:08 -07:00
proj.emscripten fixed a bug in emscripten makefile 2013-07-22 16:56:02 +02:00
proj.linux issue #2412:remove platform.cpp/.h 2013-07-19 13:42:45 +08:00
proj.nacl issue #2412:remove platform.cpp/.h 2013-07-19 13:42:45 +08:00
proj.tizen Support Tizen 2.2 SDK. 2013-07-10 13:04:08 +09:00
proj.win32 issue #2412:remove platform.h/.cpp from vs project 2013-07-23 11:45:20 +08:00
script_support issue #2344: ScriptEngineManager::sharedManager --> ScriptEngineManager::getInstance, ScriptEngineManager::purgeSharedManager --> ScriptEngineManager::destroyInstance 2013-07-22 17:24:54 +08:00
shaders CCAssert -> CCASSERT 2013-07-19 22:01:27 -07:00
sprite_nodes issue #2378: More override functions. 2013-07-23 21:51:19 +08:00
support More best practices fixes and other bug fixes 2013-07-23 15:20:22 -07:00
text_input_node issue #2378: More setter/Getter, removing CC_PROPERTY_XXX macros. 2013-07-23 18:26:26 +08:00
textures Merge pull request #3214 from bmanGH/develop 2013-07-23 20:02:56 -07:00
tilemap_parallax_nodes More best practices fixes and other bug fixes 2013-07-23 15:20:22 -07:00
touch_dispatcher CCAssert -> CCASSERT 2013-07-19 22:01:27 -07:00
Android.mk issue #2412:remove platform.cpp/.h 2013-07-19 13:42:45 +08:00
CCCamera.cpp Adds const to more getters 2013-07-06 22:01:21 -07:00
CCCamera.h Adds more readability to the class internals. 2013-07-15 12:43:22 -07:00
CCConfiguration.cpp CCAssert -> CCASSERT 2013-07-19 22:01:27 -07:00
CCConfiguration.h getInstance() / destroyInstance() are used... 2013-07-11 15:24:23 -07:00
CCDirector.cpp Merge branch 'developNewLabelForRiq' into label_merge 2013-07-24 15:15:08 -07:00
CCDirector.h issue #2378: Setter/Getter for Director, removing CC_PROPERTY_XXX macros. 2013-07-23 15:19:26 +08:00
CCScheduler.cpp issue #2344: ScriptEngineManager::sharedManager --> ScriptEngineManager::getInstance, ScriptEngineManager::purgeSharedManager --> ScriptEngineManager::destroyInstance 2013-07-22 17:24:54 +08:00
CCScheduler.h More best practices fixes 2013-07-18 16:30:19 -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