Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/base
History
James Chen 21a9f05110 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor 
Conflicts:
	cocos/2d/CCUserDefault.cpp
	cocos/2d/CCUserDefault.mm
	cocos/2d/CCUserDefaultAndroid.cpp
	cocos/2d/ZipUtils.cpp
	cocos/2d/platform/CCFileUtils.h
	cocos/2d/platform/CCSAXParser.cpp
 		2013-12-20 21:12:11 +08:00
..
CCAffineTransform.cpp Migrated code to Matrix4 2013-12-10 11:07:15 -08:00
CCAffineTransform.h Migrated code to Matrix4 2013-12-10 11:07:15 -08:00
CCArray.cpp replaces std::for_each with for() 2013-12-19 13:34:41 -08:00
CCArray.h use ssize_t for capacity and index in containers 2013-12-12 14:48:26 +08:00
CCAutoreleasePool.cpp replaces std::for_each with for() 2013-12-19 13:34:41 -08:00
CCAutoreleasePool.h issue #2790: Autorelease pool is using Vector<T> now. 2013-12-07 14:23:29 +08:00
CCBool.h issue #2790: Deprecates Dictionary, Array, String, Integer, Bool, Float, Double classes. 2013-12-11 18:08:06 +08:00
CCConsole.cpp getDescription() works as expected 2013-12-12 14:30:22 -08:00
CCConsole.h Merge commit 'refs/pull/4433/head' of git://github.com/cocos2d/cocos2d-x into ccconsole 2013-12-05 16:26:04 +08:00
CCData.cpp Refactors Data class, adds FileUtils::getStringFromFile, FileUtils::getDataFromFile and deprecates FileUtils::getFileData. 2013-12-18 14:58:17 +08:00
CCData.h Refactors Data class, adds FileUtils::getStringFromFile, FileUtils::getDataFromFile and deprecates FileUtils::getFileData. 2013-12-18 14:58:17 +08:00
CCDataVisitor.cpp Refactors Data class, adds FileUtils::getStringFromFile, FileUtils::getDataFromFile and deprecates FileUtils::getFileData. 2013-12-18 14:58:17 +08:00
CCDataVisitor.h Refactors Data class, adds FileUtils::getStringFromFile, FileUtils::getDataFromFile and deprecates FileUtils::getFileData. 2013-12-18 14:58:17 +08:00
CCDictionary.cpp replaces std::for_each with for() 2013-12-19 13:34:41 -08:00
CCDictionary.h issue #2790: Reverts comments in CCDictionary.h 2013-12-12 09:53:50 +08:00
CCDouble.h issue #2790: Deprecates Dictionary, Array, String, Integer, Bool, Float, Double classes. 2013-12-11 18:08:06 +08:00
CCFloat.h issue #2790: Deprecates Dictionary, Array, String, Integer, Bool, Float, Double classes. 2013-12-11 18:08:06 +08:00
CCGeometry.cpp use float instead for create point object 2013-11-08 14:13:39 +08:00
CCGeometry.h Merge pull request #4111 from boyu0/iss2771_physical 2013-11-07 18:51:15 -08:00
CCInteger.h issue #2790: Deprecates Dictionary, Array, String, Integer, Bool, Float, Double classes. 2013-12-11 18:08:06 +08:00
CCMap.h replaces std::for_each with for() 2013-12-19 13:34:41 -08:00
CCNS.cpp fix some warnings 2013-12-06 16:32:06 +08:00
CCNS.h issue #2790: const char* —> const std::string& for CCNS.h/.cpp. 2013-12-04 16:02:53 +08:00
CCObject.cpp issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCObject.h issue #2771: enhance Listener use EventListener mechanism 2013-11-01 14:50:06 +08:00
CCPlatformConfig.h added support for msys2 mingwtoolchains and fix x64 cocos/audio on windows platform for MSVC and Mingw. Also fixed a few very bad type casts very important for future Arm64 bit processors 2013-12-05 03:37:27 +00:00
CCPlatformMacros.h Merge pull request #4410 from signmotion/corrected_DISALLOW_COPY_AND_ASSIGN 2013-12-03 19:21:45 -08:00
CCSet.cpp issue #2790: Deprecates CCSet. 2013-12-06 18:16:58 +08:00
CCSet.h issue #2790: Deprecates CCSet. 2013-12-06 18:16:58 +08:00
CCString.cpp Refactors Data class, adds FileUtils::getStringFromFile, FileUtils::getDataFromFile and deprecates FileUtils::getFileData. 2013-12-18 14:58:17 +08:00
CCString.h issue #2790: Reverts comments in CCString.h 2013-12-12 10:34:41 +08:00
CCValue.cpp Small fix in CCValue.cpp. visitMap is a template that supports IntValueMap and ValueMap. IntValueMap is confused. ValueMapIntKey seems better. 2013-12-18 17:01:57 +08:00
CCValue.h issue #2790: Addes Value::Null variable. 2013-12-11 18:08:05 +08:00
CCVector.h #include <algorithm> for std::find in CCVector.h. 2013-12-20 10:12:07 +08:00
CMakeLists.txt Merge branch 'develop' into console 2013-12-04 21:58:11 -08:00
atitc.cpp issue #2770: fix some warning 2013-11-11 12:49:38 +08:00
atitc.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
etc1.cpp issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
etc1.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
s3tc.cpp issue #2770: fix some warning 2013-11-11 12:49:38 +08:00
s3tc.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00