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
Huabing.Xu e935481361 Merge branch 'develop' into Iss2460-glfw-refractor 
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
	cocos2dx/platform/mac/CCEGLView.mm
	samples/Cpp/TestCpp/proj.linux/main.cpp
	samples/Cpp/TestCpp/proj.win32/main.cpp
 		2013-08-28 13:42:22 +08:00
..
android update Android.mk to remove deleted cpp files 2013-08-26 18:01:42 +08:00
emscripten closed #2650: Remove ccTypeInfo since we could get the hash value from *typeid(T).hash_code()* if using c++11. 2013-08-22 18:16:50 +08:00
ios closed #2650: Remove ccTypeInfo since we could get the hash value from *typeid(T).hash_code()* if using c++11. 2013-08-22 18:16:50 +08:00
linux Merge branch 'develop' into Iss2460-glfw-refractor 2013-08-28 13:42:22 +08:00
mac Merge branch 'develop' into Iss2460-glfw-refractor 2013-08-28 13:42:22 +08:00
nacl Merge pull request #3456 from sbc100/fix_build 2013-08-22 00:39:16 -07:00
qt5 closed #2650: Remove ccTypeInfo since we could get the hash value from *typeid(T).hash_code()* if using c++11. 2013-08-22 18:16:50 +08:00
third_party Merge branch 'develop' into Iss2460-glfw-refractor 2013-08-28 13:42:22 +08:00
tizen closed #2650: Remove ccTypeInfo since we could get the hash value from *typeid(T).hash_code()* if using c++11. 2013-08-22 18:16:50 +08:00
win32 Merge branch 'develop' into Iss2460-glfw-refractor 2013-08-28 13:42:22 +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 Merge pull request #3447 from NatWeiss/patch-5 2013-08-25 18:35:57 -07:00
CCFileUtils.h closed #2650: Remove ccTypeInfo since we could get the hash value from *typeid(T).hash_code()* if using c++11. 2013-08-22 18:16:50 +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