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
James Chen f2f3aa55bf Merge branch 'gles20' of https://github.com/johnangel/cocos2d-x into iss-vs2012 
Conflicts:
	samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj
	samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj
	samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj
	samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj
	samples/Javascript/TestJavascript/proj.win32/TestJavascript.vcxproj
	samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj
	samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj
	samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj
	scripting/javascript/bindings/generated
	scripting/lua/proj.win32/liblua.vcxproj
 		2012-12-29 09:48:22 +08:00
..
android fixed #1623:use file descriptor instead of file path to create media player 2012-12-24 17:20:44 +08:00
blackberry add Hungarian language support 2012-12-05 11:31:05 +01:00
ios add Hungarian language support 2012-12-05 11:31:05 +01:00
linux add Hungarian language support 2012-12-05 11:31:05 +01:00
mac add Hungarian language support 2012-12-05 11:31:05 +01:00
marmalade marmalade acceleromater improvement 2012-12-24 17:24:10 +01:00
third_party Mac OS Marmalade fixes 2012-12-10 09:54:34 +08:00
win32 ESC button on Windows behaves like Back button 2012-12-19 21:11:26 +01:00
CCAccelerometerDelegate.h Added "executeAccelerometerEvent" for CCScriptEngineProtocol class. Exported Accelerometer event to JS. 2012-11-06 14:18:13 +08:00
CCApplicationProtocol.h Minor changes to comments. One integer literal changed to float literal. 2012-09-14 15:26:38 -07:00
CCCommon.h cosmetics: fix formating 2012-12-05 11:43:04 +01:00
CCEGLViewProtocol.cpp fixed #1520: Added comments for using multiresolution in HelloCpp. 2012-10-23 10:50:47 +08:00
CCEGLViewProtocol.h fixed #1520: Updated some comments. 2012-10-23 14:01:48 +08:00
CCFileUtils.h Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-09-14 15:27:55 -07:00
CCFileUtilsCommon_cpp.h Minor English Spelling Corrections, etc. 2012-09-15 14:19:14 -07:00
CCImage.h Minor English Spelling Corrections, etc. 2012-09-15 14:19:14 -07:00
CCImageCommon_cpp.h Add error handler when read image data using libjpeg. 2012-11-01 21:45:51 +08:00
CCPlatformConfig.h use macro CC_TARGET_OS_IPHONE instead of TARGET_OS_IPHONE and make xcode template work ok 2012-11-26 15:08:40 +08:00
CCPlatformMacros.h issue #1564: Return a new object instead of 'const reference' for some get methods. 2012-11-20 16:34:55 +08:00
CCSAXParser.cpp Minor English Spelling Corrections, etc. 2012-09-15 14:19:14 -07:00
CCSAXParser.h add groups to all classes for doxygen 2012-06-20 18:09:11 +08:00
CCThread.cpp Fixes CCThread.cpp so it is not included for Mac builds. 2012-09-15 00:37:12 -07:00
CCThread.h add groups to all classes for doxygen 2012-06-20 18:09:11 +08:00
platform.cpp issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 2012-04-19 14:35:52 +08:00
platform.h add groups to all classes for doxygen 2012-06-20 18:09:11 +08:00