Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into is…

…s1280_labeltest
mingulov · May 31, 2012 · e392d61 · e392d61
2 parents 8574ad4 + 69540a1
commit e392d61
Show file tree

Hide file tree

Showing 5 changed files with 161 additions and 30 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,90 @@
+cocos2d-2.0-rc0a-x-2.0 @May.31 2012
+ [all platforms]
+    Bug       #1094: fix a bug that nothing will be shown when using CCParticleBatchNode
+    Bug       #1115: fix a bug that CCFileUtils::fullPathFromRelativePath() with resolution parameter return error value with empty string
+    Bug       #1137: fix a memory leak in CCLabelBMFont and sync the implementation of CCLabelBMFont to gles20 branch
+    Bug       #1138: fix a memory leak in CCTextureCache::addPVRImage.
+    Bug       #1155: revert CCDirector singleton to original implementation
+    Bug       #1157: fix a bug that nothing is shown in TMX Orthogonal Test
+    Bug       #1158: fix a bug in CCParticleSystemQuad
+    Bug       #1159: update "CallFuncND + auto remove" test demo
+    Bug       #1160: rename 'CGFloat' to 'CCFloat'
+    Bug       #1164: add the render mode which uses VBO without VAO in CCParticleSystemQuad
+    Bug       #1165: merge pull request #842
+    Bug       #1187: fix a bug that spanish(Buen día) cannot be shown completely in CCLabelBMFont unicode test
+    Bug       #1189: CCLabelBMFont updateLabel() optimizations and fixes
+    Bug       #1212: fix a bug that TMXBug787Test crash.
+    Bug       #1217: fix a bug that EaseActions reverse broken
+    Bug       #1232: fix a bug that CCLayerGradient::updateColor() assign wrong value to m_pSquareColors
+    Bug       #1244: fix memory leak in CCParticleSystem::initWithDictionary()
+    Bug       #1273: fix a bug that app will crash after clicking closed button in TextureCacheTest
+    Bug       #1275: fix memory leaks in tests project
+    Bug       #1277: implement CCToggleVisibility::copyWithZone()
+    Feature   #1114: integrate CCControlExtension and implement corresponding tests
+    Feature   #1180: synchronize CCConfiguration
+    Feature   #1194: merge texturewatcher contributed by NetGragon
+    Feature   #1205: add ccbreader and test case for CocosBuilder
+    Feature   #1240: support TIFF format picture
+    Feature   #1258: merge Rolando's testjs into gles20 branch
+    Refactor  #1156: synchronize CCDirector
+    Refactor  #1166: improve CCString and CCArray, optimize CCDictionary
+    Refactor  #1176: change linebreak symbol to UNIX format ('\n'), replace 'tab' with four spaces
+    Refactor  #1177: refactor platform
+    Refactor  #1178: use macro NS_CC_BEGIN instead of "namespace cocos2d {", NS_CC_END instead of "}"
+    Refactor  #1188: refactor directory structure
+    Refactor  #1191: update templates for all platforms
+    Refactor  #1198: optimize CCTextureCache::removeUnusedTextures()
+    Refactor  #1203: remove CCFileUtils::setResource(const char* pszZipFileName) and SimpleAudioEngine::setResource
+    Refactor  #1204: refactor AppDelegate::initInstance()
+    Refactor  #1206: remove some unused files, only supports iOS, win32 and android
+    Refactor  #1211: translate Chinese comments to English for CCTextureWatcher and CCListView
+    Refactor  #1246: fix CCDirector using CCLabelBMFont instead of CCLabelTTF
+    Refactor  #1252: add CCEGLViewProtocol::getFrameSize() method for getting the real screen size of device
+    Refactor  #1253: add static method "purgeConfiguration" for CCConfiguration to avoid memory leak
+ [iOS]   
+    Bug       #1109: add parentheses to remove Xcode warnings 
+    Bug       #1230: fix a bug that Calculation of string width may be wrong on iOS
+    Bug       #1266: fix a bug that CCTextureCahce::addImageAsync() don't work correctly on iOS
+    Feature   #1095: IOS screen resolution support
+ [android]
+    Bug       #1139: fix a bug that screen becomes black when backing from background
+    Bug       #1140: fix a bug that ParticleTest crashed
+    Bug       #1141: fix a bug that NodeTest crashed in StressTest1 and StressTest2
+    Bug       #1142: fix a bug that TouchesTest crashed
+    Bug       #1143: fix a bug that MenuTest crashed
+    Bug       #1144: fix a bug that ParallaxTest crashed
+    Bug       #1145: fix a bug that TileMap crashed
+    Bug       #1146: fix a bug that IntervalTest crashed
+    Bug       #1147: fix a bug that ChipmunkAccelTouchTest crashed
+    Bug       #1148: fix a bug that LabelTest crashed
+    Bug       #1149: fix a bug that SpriteTest crashed when go to second test case
+    Bug       #1150: fix a bug that RenderTextureTest crashed at second test case
+    Bug       #1151: fix a bug that Box2DTest crashed
+    Bug       #1152: fix a bug that PerformanceTest crashed at 1, 2, 5 test cases
+    Bug       #1185: fix a bug that when backing to foreground, will lost texture if it uses sprite batch node
+    Bug       #1216: fix JNI memory leaks
+    Bug       #1229: fix a bug that android port can not be compiled on ndk android-8 level
+    Bug       #1236: fix a bug that JniHelper::jstring2string may crash when parameter is null
+    Bug       #1237: fix a bug that line number message printed by CCAssert is wrong
+    Bug       #1279: fix a bug that NodeNonOpaqueTest can't be shown correctly
+    Feature   #1247: add profiler support for android
+    Feature   #1265: build dynamic library of spidermonkey for Android, and implement testjs for android
+    Refactor  #1179: popup a message box when invoking CCAssert() on Android
+    Refactor  #1201: simplify the usage of writing Android.mk
+ [windows]
+    Bug       #1215: fix a bug that Win32 retina cannot work
+    Bug       #1251: add CocosBuilderTest to the test project for VS2008
+    Bug       #1264: fix wrong string alignment when using utf-8 encoded text with CCLabelTTF
+    Bug       #1268: fix a bug that Testjs will crash after clicking the close button on win32
+    Bug       #1270: fix some warning on win32
+    Feature   #1186: add console window for Win32 application, all debug message output to this console window
+    Feature   #1263: build dynamic library of spidermonkey for win32, and add testjs project to solution
+    Refactor  #1170: remove win32 template of wophone
+ [lua]
+    Refactor  #1190: update lua binding to 2.0
+    Refactor  #1220: using CCString::stringWithContentsOfFile to get string from lua script files
+
+
 cocos2d-1.0.1-x-0.12.0 @ Mar.5 2012
  [all platforms]
      Bug      #925: rename HelloWorld/Resource to HelloWorld/Resources

diff --git a/cocos2dx/cocos2d.cpp b/cocos2dx/cocos2d.cpp
@@ -30,7 +30,7 @@ NS_CC_BEGIN
 
 const char* cocos2dVersion()
 {
-    return "cocos2d-2.0-rc0a-x-0.1.0";
+    return "cocos2d-2.0-rc0a-x-2.0";
 }
 
 NS_CC_END

diff --git a/create-android-project.sh b/create-android-project.sh
@@ -99,8 +99,7 @@ check_path(){
 create_android_project(){
     echo "Input package path. For example: org.cocos2dx.example"
     read PACKAGE_PATH
-    echo "Now cocos2d-x supports Android 2.1-update1, 2.2, 2.3 & 3.0"
-    echo "Other versions have not tested."
+    echo "Now cocos2d-x supports Android 2.2 or upper version"
     $ANDROID_SDK_ROOT_LOCAL/tools/android list targets
     echo "input target id:"
     read TARGET_ID

diff --git a/template/xcode4/lib_cocos2dx.xctemplate/TemplateInfo.plist b/template/xcode4/lib_cocos2dx.xctemplate/TemplateInfo.plist
@@ -793,6 +793,58 @@
 			<key>TargetIndices</key>
 			<array/>
 		</dict>
+		<key>libs/cocos2dx/extensions/CCBReader/CCBCustomClass.cpp</key>
+		<dict>
+			<key>Group</key>
+			<array>
+				<string>libs</string>
+				<string>cocos2dx</string>
+				<string>extensions</string>
+				<string>CCBReader</string>
+			</array>
+			<key>Path</key>
+			<string>libs/cocos2dx/extensions/CCBReader/CCBCustomClass.cpp</string>
+		</dict>
+		<key>libs/cocos2dx/extensions/CCBReader/CCBCustomClass.h</key>
+		<dict>
+			<key>Group</key>
+			<array>
+				<string>libs</string>
+				<string>cocos2dx</string>
+				<string>extensions</string>
+				<string>CCBReader</string>
+			</array>
+			<key>Path</key>
+			<string>libs/cocos2dx/extensions/CCBReader/CCBCustomClass.h</string>
+			<key>TargetIndices</key>
+			<array/>
+		</dict>
+		<key>libs/cocos2dx/extensions/CCBReader/CCBReader.h</key>
+		<dict>
+			<key>Group</key>
+			<array>
+				<string>libs</string>
+				<string>cocos2dx</string>
+				<string>extensions</string>
+				<string>CCBReader</string>
+			</array>
+			<key>Path</key>
+			<string>libs/cocos2dx/extensions/CCBReader/CCBReader.h</string>
+			<key>TargetIndices</key>
+			<array/>
+		</dict>
+		<key>libs/cocos2dx/extensions/CCBReader/CCBReader_v2.cpp</key>
+		<dict>
+			<key>Group</key>
+			<array>
+				<string>libs</string>
+				<string>cocos2dx</string>
+				<string>extensions</string>
+				<string>CCBReader</string>
+			</array>
+			<key>Path</key>
+			<string>libs/cocos2dx/extensions/CCBReader/CCBReader_v2.cpp</string>
+		</dict>
 		<key>libs/cocos2dx/extensions/CCControlExtension/CCControl.cpp</key>
 		<dict>
 			<key>Group</key>
@@ -2319,30 +2371,6 @@
 			<key>TargetIndices</key>
 			<array/>
 		</dict>
-		<key>libs/cocos2dx/platform/CCStdC.cpp</key>
-		<dict>
-			<key>Group</key>
-			<array>
-				<string>libs</string>
-				<string>cocos2dx</string>
-				<string>platform</string>
-			</array>
-			<key>Path</key>
-			<string>libs/cocos2dx/platform/CCStdC.cpp</string>
-		</dict>
-		<key>libs/cocos2dx/platform/CCStdC.h</key>
-		<dict>
-			<key>Group</key>
-			<array>
-				<string>libs</string>
-				<string>cocos2dx</string>
-				<string>platform</string>
-			</array>
-			<key>Path</key>
-			<string>libs/cocos2dx/platform/CCStdC.h</string>
-			<key>TargetIndices</key>
-			<array/>
-		</dict>
 		<key>libs/cocos2dx/platform/CCThread.h</key>
 		<dict>
 			<key>Group</key>
@@ -2616,6 +2644,20 @@
 			<key>TargetIndices</key>
 			<array/>
 		</dict>
+		<key>libs/cocos2dx/platform/ios/CCStdC.h</key>
+		<dict>
+			<key>Group</key>
+			<array>
+				<string>libs</string>
+				<string>cocos2dx</string>
+				<string>platform</string>
+				<string>ios</string>
+			</array>
+			<key>Path</key>
+			<string>libs/cocos2dx/platform/ios/CCStdC.h</string>
+			<key>TargetIndices</key>
+			<array/>
+		</dict>
 		<key>libs/cocos2dx/platform/ios/CCThread.mm</key>
 		<dict>
 			<key>Group</key>
@@ -4079,6 +4121,10 @@
 		<string>libs/cocos2dx/effects/CCGrabber.h</string>
 		<string>libs/cocos2dx/effects/CCGrid.cpp</string>
 		<string>libs/cocos2dx/effects/CCGrid.h</string>
+		<string>libs/cocos2dx/extensions/CCBReader/CCBCustomClass.cpp</string>
+		<string>libs/cocos2dx/extensions/CCBReader/CCBCustomClass.h</string>
+		<string>libs/cocos2dx/extensions/CCBReader/CCBReader.h</string>
+		<string>libs/cocos2dx/extensions/CCBReader/CCBReader_v2.cpp</string>
 		<string>libs/cocos2dx/extensions/CCControlExtension/CCControl.cpp</string>
 		<string>libs/cocos2dx/extensions/CCControlExtension/CCControl.h</string>
 		<string>libs/cocos2dx/extensions/CCControlExtension/CCControlButton.cpp</string>
@@ -4198,8 +4244,6 @@
 		<string>libs/cocos2dx/platform/CCPlatformMacros.h</string>
 		<string>libs/cocos2dx/platform/CCSAXParser.cpp</string>
 		<string>libs/cocos2dx/platform/CCSAXParser.h</string>
-		<string>libs/cocos2dx/platform/CCStdC.cpp</string>
-		<string>libs/cocos2dx/platform/CCStdC.h</string>
 		<string>libs/cocos2dx/platform/CCThread.h</string>
 		<string>libs/cocos2dx/platform/ios/AccelerometerDelegateWrapper.h</string>
 		<string>libs/cocos2dx/platform/ios/AccelerometerDelegateWrapper.mm</string>
@@ -4221,6 +4265,7 @@
 		<string>libs/cocos2dx/platform/ios/CCLock.cpp</string>
 		<string>libs/cocos2dx/platform/ios/CCLock.h</string>
 		<string>libs/cocos2dx/platform/ios/CCPlatformDefine.h</string>
+		<string>libs/cocos2dx/platform/ios/CCStdC.h</string>
 		<string>libs/cocos2dx/platform/ios/CCThread.mm</string>
 		<string>libs/cocos2dx/platform/ios/EAGLView.h</string>
 		<string>libs/cocos2dx/platform/ios/EAGLView.mm</string>

diff --git a/tools/xcode4_template_generator/run_generator.sh b/tools/xcode4_template_generator/run_generator.sh
@@ -2,7 +2,7 @@ pushd ../../
 
 echo "generating libcocos2dx"
 mkdir -p template/xcode4/lib_cocos2dx.xctemplate
-python ./tools/xcode4_template_generator/template_generator.py --directory cocos2dx --identifier libcocos2dx --prefix libs --exclude "android win32 airplay wophone bada third_party CCImage.cpp CCThread.cpp proj.ios CCFileUtilsCommon_cpp.h CCImageCommon_cpp.h CCFileUtils.cpp Android.mk Linux linux qnx marmalade" > ./template/xcode4/lib_cocos2dx.xctemplate/TemplateInfo.plist
+python ./tools/xcode4_template_generator/template_generator.py --directory cocos2dx --identifier libcocos2dx --prefix libs --exclude "android win32 airplay wophone bada third_party CCImage.cpp CCThread.cpp proj.ios CCFileUtilsCommon_cpp.h CCImageCommon_cpp.h CCFileUtils.cpp Android.mk Linux linux qnx marmalade CCBReader_v1.cpp" > ./template/xcode4/lib_cocos2dx.xctemplate/TemplateInfo.plist
 
 echo "generating libcocosdenshion"
 mkdir -p template/xcode4/lib_cocosdenshion.xctemplate