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
carlo morgantini b2579987e5 Merge remote-tracking branch 'cocos2d/develop' into new_develop_merge 
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
	cocos2dx/include/ccTypes.h
	samples/samples.xcodeproj/project.pbxproj
 		2013-07-31 13:58:25 -07:00
..
android Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345 and fix the per premultipied tag 2013-07-30 11:10:05 +08:00
blackberry Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345 2013-07-27 22:06:30 +08:00
emscripten Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345 and fix the per premultipied tag 2013-07-30 11:10:05 +08:00
ios edit for lua 2013-07-29 14:04:51 +08:00
linux Merge remote-tracking branch 'cocos2d/develop' into new_develop_merge 2013-07-31 13:58:25 -07:00
mac Fixing warnings of the order of member variables and fixing errors for tizen projects. 2013-07-29 14:07:57 +08:00
nacl Closed #2345 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345 2013-07-29 11:40:18 +08:00
qt5 Qt 5 port: Fixes to build against "develop" branch 2013-07-26 08:55:46 +00:00
third_party Merge remote-tracking branch 'cocos2d/develop' into new_develop_merge 2013-07-31 13:58:25 -07:00
tizen Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345 and fix the per premultipied tag 2013-07-30 11:10:05 +08:00
win32 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345 and fix the per premultipied tag 2013-07-30 11:10:05 +08:00
CCAccelerometerDelegate.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCApplicationProtocol.h Application::Platform::OS_MACOS --> Application::Platform::OS_MAC. 2013-07-26 20:24:33 +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 Removes Hungarian notation 2013-07-25 15:53:24 -07:00
CCFileUtils.h Removes Hungarian notation 2013-07-25 15:53:24 -07:00
CCImage.h fix some compile error and pass the linux compile 2013-07-30 13:45:50 +08:00
CCImageCommon_cpp.h fix the travis ci compile error 2013-07-30 14:16:23 +08:00
CCPlatformConfig.h Add new platform: CC_PLATFORM_QT5 2013-07-24 20:18:43 +02:00
CCPlatformMacros.h Remove colon after @param @warning @deprecated 2013-07-30 10:56:14 +08:00
CCSAXParser.cpp More best practices fixes and other bug fixes 2013-07-23 15:20:22 -07:00
CCSAXParser.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCThread.cpp issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCThread.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00