Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into modify_prompt

This commit is contained in:
dumganhar 2012-01-12 21:07:10 +08:00
commit 29b03b5355
3 changed files with 62 additions and 16 deletions

View File

@ -1,23 +1,69 @@
cocos2d-1.0.1-x-0.11.0 @ Jan.13 2012
[blackberry]
Feature #907: support blackberry playbook
[all platforms]
Bug #752: fix a bug that enable and disable touch more times in touch handler callback function may cause memory leak
Bug #911: fix a bug that TextureCache::addUIImage() cannot create texture when key is null
Bug #920: export export functions in CCAffineTransform with CC_DLL
Bug #922: make CCTexture2D::setPVRImagesHavePremultipliedAlpha() to be a static function
Bug #926: fix a crash caused by RTTI when running TouchesTest
Bug #936: fix a bug that touch menu item may crash when selector is null
Feature #892: use RTTI to simplify the codes
Feature #903: add touch index for CCTouch
Refactor #934: add 'isEqual' function for CCString, make CCObject::isEqual to a virtual function
Refactor #940: use new icons and new background pictures with new logo of cocos2d-x
[android]
Bug #923: fix a bug that CCTextureCache::addImageAsync() crashes when a game enters foreground from background
Bug #906: remove unneeded codes in CCImage_android.cpp
Bug #910: fix a bug that create-android-project.bat may erase exist folder with appointed name
Bug #884: fix a crash error caused by CocosDenshion on android simulator
Bug #921: fix a bug that accelerometer axes inverted in Motorola Xoom tablet
Bug #928: fix a bug that 16-bit texture is changed to 32-bit after application enter foreground
Bug #935: fix a bug that terminateProcessJNI() invoke wrong jni function
Bug #937: fix a compiling error on android x86
Bug #941: fix a bug that volume of background music may not in [0, 1.0]
Feature #887: define GL_GLEXT_PROTOTYPES = 1 automatically when compile on ndk r7
Feature #919: improve build_native.sh and create-android-project.sh
Refactor #924: make loading music resources thread safe
Document #837: Write a document describes how to use jni
Document #914: update document to fit android r5~r7
[iOS]
Bug #917: implement CCFileUtils::getFileDataFromZip()
Feature #893: remove cached data when receiving memory warning on iOS
[bada]
Bug #918: fix a compiling error after renaming airplay to marmalade
Bug #927: fix a crash caused by invoking unloadEffect after invoking stopEffect
Bug #938: fix a bug that glGenFramebuffersOES isn't supported on wave m device
Bug #943: fix a bug that box2d can't be compiled successfully on bada sdk 1.2.1
Refactor #904: Recreate bada 2.0 projects
[win32]
Bug #915: fix a bug that msvc template uses old version of .cpp files
[linux]
Bug #888: fix compiling error with eclipse
Bug #930: fix a crash caused by load jpg format files
[marmalade]
Refactor #908: merge marmalade to latest cocos2d-x source
cocos2d-1.0.1-x-0.10.0 @ Dec.2 2011
[bada]
Feature #223 integrate cocos2d-bada branch to master
Bug #852 fix a bug that CCSpriteBatchNode cannot be drawn correctly
[all platforms]
Feature #854 integrate pthread and write a test case on all platforms
Feature #465 implement CCTextureCache::addImageAsync()
Feature #850 upgrade box2d from 2.1.2 to last 2.2.1
Feature #781 add functions for effects
Feature #760 add methods to get/set CCDirector::m_pNotificationNode
Bug #883 fix the crash of SpriteTest
Refactor #879 use CCAssert() instead of assert()
Feature #854 integrate pthread and write a test case on all platforms
Feature #465 implement CCTextureCache::addImageAsync()
Feature #850 upgrade box2d from 2.1.2 to last 2.2.1
Feature #781 add functions for effects
Feature #760 add methods to get/set CCDirector::m_pNotificationNode
Bug #883 fix the crash of SpriteTest
Refactor #879 use CCAssert() instead of assert()
Document #882 Write a document describes some cautions about using pthread
[android]
Feature #838 support android x86 platform
Bug #758 fix a bug that custom TTF fonts causing low memory
Bug #848 fix a bug that accelerometer values are wrong if the content is scaled
Bug #885 fix a bug that SimpleAudioEngine::setEffectVolume() don't take effect immediately
Document #864 write a describe how to build on sdk 4.0 & ndk-r7
Document #878 write a document describe how to build project for x86 android
Feature #838 support android x86 platform
Bug #758 fix a bug that custom TTF fonts causing low memory
Bug #848 fix a bug that accelerometer values are wrong if the content is scaled
Bug #885 fix a bug that SimpleAudioEngine::setEffectVolume() don't take effect immediately
Document #864 write a describe how to build on sdk 4.0 & ndk-r7
Document #878 write a document describe how to build project for x86 android
Document #881 write a document describes building android ndk project with ndk-r7
[linux]
Bug #780 fix build error on ubuntu 11.0

View File

@ -419,6 +419,6 @@ public:
static CCEaseBackInOut* actionWithAction(CCActionInterval* pAction);
};
#endif // __ACTION_CCEASE_ACTION_H__
}
#endif // __ACTION_CCEASE_ACTION_H__

View File

@ -38,7 +38,7 @@ move_eclipse_configures_into(){
sed -i "s/HelloWorld/$APP_NAME/" $APP_DIR/Linux/.project
sed -i "s:\.\./\.\./\.\./:$COCOS2DX_ROOT:;s:helloworld:$APP_NAME:" $APP_DIR/Linux/.cproject
sed -i "s/HelloWorld/$APP_NAME/" $APP_DIR/Linux/.cproject
}
move_files_into_linux