Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/2d/platform
History
boyu0 62fc889a54 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into const_char_star_to_std_string 
Conflicts:
	cocos/2d/platform/CCFileUtils.cpp
	cocos/2d/platform/CCFileUtils.h
	cocos/2d/platform/CCImageCommon_cpp.h
	cocos/2d/platform/CCSAXParser.cpp
	cocos/2d/platform/CCSAXParser.h
 		2013-12-25 10:41:37 +08:00
..
android Reverts FileUtil::getFileData to virtual function. 2013-12-24 16:29:55 +08:00
apple More std::for_each —> for(const auto& …) 2013-12-20 09:54:50 +08:00
ios change some const char* to const std::string& 2013-12-24 15:49:58 +08:00
linux replace long with int or ssize_t 2013-12-05 17:22:22 +08:00
mac change some const char* to const std::string& 2013-12-24 10:51:47 +08:00
win32 Refactors Data class, adds FileUtils::getStringFromFile, FileUtils::getDataFromFile and deprecates FileUtils::getFileData. 2013-12-18 14:58:17 +08:00
CCApplicationProtocol.h issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
CCCommon.h Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
CCDevice.h Macro CC_DISABLE_COPY is renamed to CC_DISALLOW_COPY_AND_ASSIGN 2013-11-22 16:09:05 -08:00
CCEGLViewProtocol.cpp Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
CCEGLViewProtocol.h Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
CCFileUtils.cpp Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into const_char_star_to_std_string 2013-12-25 10:41:37 +08:00
CCFileUtils.h Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into const_char_star_to_std_string 2013-12-25 10:41:37 +08:00
CCImage.h change some const char* to const std::string& 2013-12-24 15:49:58 +08:00
CCImageCommon_cpp.h Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into const_char_star_to_std_string 2013-12-25 10:41:37 +08:00
CCSAXParser.cpp change some const char* to const std::string& 2013-12-24 10:51:47 +08:00
CCSAXParser.h change some const char* to const std::string& 2013-12-24 10:51:47 +08:00
CCThread.cpp use Schedule::performFunctionInCocosThread 2013-12-06 14:15:01 +08:00
CCThread.h use Schedule::performFunctionInCocosThread 2013-12-06 14:15:01 +08:00