Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx
History
carlo morgantini 8416e7cf6d Merge remote-tracking branch 'cocos2d/develop' into developNewLabelMergeDevelop 
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
	scripting/javascript/bindings/generated
	tools/bindings-generator
 		2013-07-26 15:54:50 -07:00
..
actions Documentation fix: use \p to reference a parameter 2013-07-26 12:04:03 +08:00
base_nodes ccGLXXX -> GL::xxx 2013-07-25 18:42:53 -07:00
cocoa Removes Hungarian notation 2013-07-25 15:53:24 -07:00
draw_nodes Fixing errors when disabling VAO. 2013-07-26 13:49:24 +08:00
effects ccGLXXX -> GL::xxx 2013-07-25 18:42:53 -07:00
include Merge remote-tracking branch 'cocos2d/develop' into developNewLabelMergeDevelop 2013-07-26 15:54:50 -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 remote-tracking branch 'cocos2d/develop' into developNewLabelMergeDevelop 2013-07-26 15:54:50 -07:00
layers_scenes_transitions_nodes Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into constants-refactor 2013-07-26 19:56:04 +08:00
menu_nodes More const fixes 2013-07-25 17:47:42 -07:00
misc_nodes enum class for ProgressTimer::type 2013-07-26 17:28:18 +08:00
particle_nodes Fixing errors when disabling VAO. 2013-07-26 13:49:24 +08:00
platform Merge remote-tracking branch 'cocos2d/develop' into developNewLabelMergeDevelop 2013-07-26 15:54:50 -07:00
proj.emscripten Use of a single emscripten HTML template file. 2013-07-24 17:59:21 +02:00
proj.linux issue #2430:move GLProgram enum into class 2013-07-25 17:48:22 +08:00
proj.nacl issue #2430:move GLProgram enum into class 2013-07-25 17:48:22 +08:00
proj.tizen Support Tizen 2.2 SDK. 2013-07-10 13:04:08 +09:00
proj.win32 Warning fix in CCRenderTexture.h. 2013-07-26 14:15:19 +08:00
script_support issue #2344: ScriptEngineManager::sharedManager --> ScriptEngineManager::getInstance, ScriptEngineManager::purgeSharedManager --> ScriptEngineManager::destroyInstance 2013-07-22 17:24:54 +08:00
shaders ccGLXXX -> GL::xxx 2013-07-25 18:42:53 -07:00
sprite_nodes ccGLXXX -> GL::xxx 2013-07-25 18:42:53 -07:00
support Removes Hungarian notation 2013-07-25 15:53:24 -07:00
text_input_node Constant fixes 2013-07-25 13:36:19 -07:00
textures issue #2430:fix some errors 2013-07-26 18:07:40 +08:00
tilemap_parallax_nodes Removes more Hungarian notation and more 2013-07-25 16:27:24 -07:00
touch_dispatcher More enum class: ScrollView::Direction, TableView::VerticalFillOrder 2013-07-26 22:55:41 +08:00
Android.mk issue #2430:fix conflict 2013-07-25 21:37:12 +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 More const fixes 2013-07-25 17:47:42 -07:00
CCDeprecated.cpp issue #2430: Moved constant to header file to avoid errors in 'switch case', the error is 'case value is not a constant expression'. 2013-07-27 00:55:41 +08:00
CCDirector.cpp Merge remote-tracking branch 'cocos2d/develop' into developNewLabelMergeDevelop 2013-07-26 15:54:50 -07:00
CCDirector.h Constant fixes 2013-07-25 13:36:19 -07:00
CCScheduler.cpp issue #2430:use const member variable instead of macro 2013-07-25 21:04:32 +08:00
CCScheduler.h issue #2430:use const member variable instead of macro 2013-07-25 21:04:32 +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
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