| .. |
|
Linux
|
Merge remote branch 'upstream/master'
|
2011-10-28 11:37:02 +08:00 |
|
airplay
|
fixed #657 Latest git version was broken
|
2011-08-04 16:37:43 +08:00 |
|
android
|
synchrolize to master
|
2011-11-18 18:53:53 +08:00 |
|
bada
|
fixed #880: implement preLoadBackgroundMusic on bada, fix the bug that playEffect repeatly can't work. Modify CC_ASSERT macro define.
|
2011-11-28 18:05:38 +08:00 |
|
ios
|
* merge upstream/master to master
|
2011-11-29 19:56:20 +08:00 |
|
third_party
|
Merge branch 'master' into master_base
|
2011-11-24 11:52:16 +08:00 |
|
win32
|
issue #879: replase assert with CCAssert
|
2011-11-28 17:28:43 +08:00 |
|
wophone
|
fixed #703: refactor Accelerometer
|
2011-08-31 17:14:29 +08:00 |
|
CCAccelerometer_platform.h
|
* merge cocos2d-1.0.1-x-0.9.2-luafix to master
|
2011-11-21 16:38:00 +08:00 |
|
CCApplication_platform.h
|
* merge cocos2d-1.0.1-x-0.9.2-luafix to master
|
2011-11-21 16:38:00 +08:00 |
|
CCArchOptimalParticleSystem.h
|
* merge cocos2d-1.0.1-x-0.9.2-luafix to master
|
2011-11-21 16:38:00 +08:00 |
|
CCCommon.cpp
|
* merge upstream/master to master
|
2011-11-29 19:56:20 +08:00 |
|
CCCommon.h
|
* merge upstream/master to master
|
2011-11-29 19:56:20 +08:00 |
|
CCEGLView_platform.h
|
* merge cocos2d-1.0.1-x-0.9.2-luafix to master
|
2011-11-21 16:38:00 +08:00 |
|
CCFileUtils.cpp
|
issue #879: replase assert with CCAssert
|
2011-11-28 17:28:43 +08:00 |
|
CCFileUtils.h
|
* merge cocos2d-1.0.1-x-0.9.2-luafix to master
|
2011-11-21 16:38:00 +08:00 |
|
CCGL.cpp
|
* format cocos2d-x source files
|
2011-11-18 21:23:54 +08:00 |
|
CCGL.h
|
* merge cocos2d-1.0.1-x-0.9.2-luafix to master
|
2011-11-21 16:38:00 +08:00 |
|
CCImage.cpp
|
issue #854: optimize CCTextureCache::addImageAsync()
|
2011-11-22 16:47:24 +08:00 |
|
CCImage.h
|
* merge upstream/master to master
|
2011-11-29 19:56:20 +08:00 |
|
CCLibxml2.h
|
move platform_support into cocos2dx/platform
|
2011-03-09 11:38:36 +08:00 |
|
CCPlatformConfig.h
|
* merge cocos2d-1.0.1-x-0.9.2-luafix to master
|
2011-11-21 16:38:00 +08:00 |
|
CCPlatformMacros.h
|
fixed #880: implement preLoadBackgroundMusic on bada, fix the bug that playEffect repeatly can't work. Modify CC_ASSERT macro define.
|
2011-11-28 18:05:38 +08:00 |
|
CCSAXParser.cpp
|
* merge cocos2d-1.0.1-x-0.9.2-luafix to master
|
2011-11-21 16:38:00 +08:00 |
|
CCSAXParser.h
|
* merge cocos2d-1.0.1-x-0.9.2-luafix to master
|
2011-11-21 16:38:00 +08:00 |
|
CCStdC.cpp
|
add bada1.0 pthread support
|
2011-11-24 00:07:50 +08:00 |
|
CCStdC.h
|
* merge upstream/master to master
|
2011-11-29 19:56:20 +08:00 |
|
CCThread.cpp
|
synchrolize to master
|
2011-11-18 18:53:53 +08:00 |
|
CCThread.h
|
issue #854: pthread work ok on iOS
|
2011-11-18 09:55:47 +08:00 |
|
platform.cpp
|
fixed #512 fix warnings in /Wall flag
|
2011-06-10 17:51:37 +08:00 |
|
platform.h
|
fixed #745: export CCTime to dll
|
2011-10-09 10:19:12 +08:00 |
4bf68e79fd