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 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
..
android Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into minggo-iss2430-modify_enum 2013-07-26 21:22:16 +08:00
emscripten Merge pull request #3276 from dumganhar/constants-refactor 2013-07-26 05:36:16 -07:00
ios Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into minggo-iss2430-modify_enum 2013-07-26 21:22:16 +08:00
linux Merge remote-tracking branch 'cocos2d/develop' into developNewLabelMergeDevelop 2013-07-26 15:54:50 -07:00
mac Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into minggo-iss2430-modify_enum 2013-07-26 21:22:16 +08:00
nacl Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into minggo-iss2430-modify_enum 2013-07-26 21:22:16 +08:00
third_party Merge branch 'developNewLabelForRiq' into label_merge 2013-07-24 15:15:08 -07:00
tizen Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into minggo-iss2430-modify_enum 2013-07-26 21:22:16 +08:00
win32 issue #2430: Fixing conflicts. 2013-07-27 01:11:21 +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 issue #2430: Refactoring enum 'ResolutionPolicy'. 2013-07-26 18:18:58 +08:00
CCEGLViewProtocol.h ResolutionPolicy::EXACTFIT --> ResolutionPolicy::EXACT_FIT 2013-07-26 20:07:41 +08: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 issue #2430:fix some errors 2013-07-26 18:07:40 +08:00
CCImageCommonWebp.cpp More constant fixes 2013-07-25 14:49:43 -07:00
CCImageCommon_cpp.h Fixed a bug in emscripten file utils. 2013-07-26 14:19:47 +02:00
CCPlatformConfig.h Adding defines and enums for Tizen. 2013-05-16 19:49:16 +09:00
CCPlatformMacros.h More best practices fixes and other bug fixes 2013-07-23 15:20:22 -07: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