Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx/platform
History
Ricardo Quesada a3eb0a058e Merge branch 'develop' into dictionary_array_fixes 
Conflicts:
	cocos2dx/platform/mac/CCFileUtilsMac.mm
	extensions/CCBReader/CCBAnimationManager.cpp
	extensions/CCBReader/CCBReader.cpp
	extensions/CCBReader/CCBSequenceProperty.cpp
	extensions/GUI/CCScrollView/CCScrollView.cpp
 		2013-08-21 20:27:19 -07:00
..
android Let CCDirector set all GL state 2013-08-19 15:58:05 -07:00
emscripten Fixed more documentation errors. 2013-08-01 20:55:43 +08:00
ios Merge branch 'develop' into dictionary_array_fixes 2013-08-21 20:27:19 -07:00
linux Merge branch 'develop' into carlomorgantinizynga-new_develop_merge 2013-08-05 10:09:15 +08:00
mac Merge branch 'develop' into dictionary_array_fixes 2013-08-21 20:27:19 -07:00
nacl Fixed more documentation errors. 2013-08-01 20:55:43 +08:00
qt5 Merge pull request #3347 from timothyqiu/docfix 2013-08-01 18:22:43 -07:00
third_party closed #2533:updating new file copyrights 2013-08-16 15:01:22 +08:00
tizen [Tizen] Update project files 2013-08-10 23:11:31 +09:00
win32 closed #2469：LabelTest and TileMapTest crash on windows. 2013-08-02 17:31:19 +08:00
CCAccelerometerDelegate.h Array & Dictionary fixes 2013-08-21 20:12:09 -07:00
CCApplicationProtocol.h Fixed more documentation errors. 2013-08-01 20:55:43 +08:00
CCCommon.h enum class for LanguageType, Application::Platform 2013-07-26 17:29:06 +08:00
CCDevice.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCEGLViewProtocol.cpp Linux: added SDL2 backend as replacement for GLFW. 2013-07-30 23:08:26 +04:00
CCEGLViewProtocol.h Linux: added SDL2 backend as replacement for GLFW. 2013-07-30 23:08:26 +04:00
CCFileUtils.cpp Initializing Array after it was constructed. 2013-08-22 10:15:47 +08:00
CCFileUtils.h Yet another documentation fix. 2013-08-01 21:40:13 +08:00
CCImage.h issue #2533: resolve some conflicts 2013-08-16 14:27:13 +08:00
CCImageCommon_cpp.h Array & Dictionary fixes 2013-08-21 20:12:09 -07:00
CCPlatformConfig.h Add new platform: CC_PLATFORM_QT5 2013-07-24 20:18:43 +02:00
CCPlatformMacros.h Merge pull request #3269 from metalbass/patch-4 2013-08-07 18:45:27 -07:00
CCSAXParser.cpp More best practices fixes and other bug fixes 2013-07-23 15:20:22 -07:00
CCSAXParser.h Array & Dictionary fixes 2013-08-21 20:12:09 -07:00
CCThread.cpp issue #2170: Fixing compilaction errors on Emscripten. 2013-08-05 11:10:12 +08:00
CCThread.h Array & Dictionary fixes 2013-08-21 20:12:09 -07:00