Updated to latest version of cocos2d and CCBReader

CocosPlayer/CocosPlayer/ServerController.mm

@@ -85,6 +85,8 @@ - (id) init
 
 - (void) redirectStdErr
 {
+    return;
+
     NSPipe* pipe = [NSPipe pipe];
     pipeReadHandle = [pipe fileHandleForReading];
 

Examples/CocosBuilderExample.xcodeproj/project.pbxproj

@@ -223,6 +223,13 @@
 		E3B19FE215E66742000B023E /* particle-snow.png in Resources */ = {isa = PBXBuildFile; fileRef = E3B19FC015E66742000B023E /* particle-snow.png */; };
 		E3B19FE315E66742000B023E /* particle-stars.png in Resources */ = {isa = PBXBuildFile; fileRef = E3B19FC115E66742000B023E /* particle-stars.png */; };
 		E3B19FE415E66742000B023E /* scale-9-demo.png in Resources */ = {isa = PBXBuildFile; fileRef = E3B19FC215E66742000B023E /* scale-9-demo.png */; };
+		E3D153DF16F815A8003BB796 /* CDAudioManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E3D153D216F815A8003BB796 /* CDAudioManager.m */; };
+		E3D153E016F815A8003BB796 /* CDOpenALSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = E3D153D516F815A8003BB796 /* CDOpenALSupport.m */; };
+		E3D153E116F815A8003BB796 /* CDXMacOSXSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = E3D153D716F815A8003BB796 /* CDXMacOSXSupport.m */; };
+		E3D153E216F815A8003BB796 /* CDXPropertyModifierAction.m in Sources */ = {isa = PBXBuildFile; fileRef = E3D153D916F815A8003BB796 /* CDXPropertyModifierAction.m */; };
+		E3D153E316F815A8003BB796 /* CocosDenshion.m in Sources */ = {isa = PBXBuildFile; fileRef = E3D153DB16F815A8003BB796 /* CocosDenshion.m */; };
+		E3D153E416F815A8003BB796 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = E3D153DC16F815A8003BB796 /* README.md */; };
+		E3D153E516F815A8003BB796 /* SimpleAudioEngine.m in Sources */ = {isa = PBXBuildFile; fileRef = E3D153DE16F815A8003BB796 /* SimpleAudioEngine.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -609,6 +616,20 @@
 		E3B19FC015E66742000B023E /* particle-snow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "particle-snow.png"; path = "Resources/particle-snow.png"; sourceTree = "<group>"; };
 		E3B19FC115E66742000B023E /* particle-stars.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "particle-stars.png"; path = "Resources/particle-stars.png"; sourceTree = "<group>"; };
 		E3B19FC215E66742000B023E /* scale-9-demo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "scale-9-demo.png"; path = "Resources/scale-9-demo.png"; sourceTree = "<group>"; };
+		E3D153D116F815A8003BB796 /* CDAudioManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDAudioManager.h; sourceTree = "<group>"; };
+		E3D153D216F815A8003BB796 /* CDAudioManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDAudioManager.m; sourceTree = "<group>"; };
+		E3D153D316F815A8003BB796 /* CDConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDConfig.h; sourceTree = "<group>"; };
+		E3D153D416F815A8003BB796 /* CDOpenALSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDOpenALSupport.h; sourceTree = "<group>"; };
+		E3D153D516F815A8003BB796 /* CDOpenALSupport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDOpenALSupport.m; sourceTree = "<group>"; };
+		E3D153D616F815A8003BB796 /* CDXMacOSXSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDXMacOSXSupport.h; sourceTree = "<group>"; };
+		E3D153D716F815A8003BB796 /* CDXMacOSXSupport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDXMacOSXSupport.m; sourceTree = "<group>"; };
+		E3D153D816F815A8003BB796 /* CDXPropertyModifierAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDXPropertyModifierAction.h; sourceTree = "<group>"; };
+		E3D153D916F815A8003BB796 /* CDXPropertyModifierAction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDXPropertyModifierAction.m; sourceTree = "<group>"; };
+		E3D153DA16F815A8003BB796 /* CocosDenshion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CocosDenshion.h; sourceTree = "<group>"; };
+		E3D153DB16F815A8003BB796 /* CocosDenshion.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CocosDenshion.m; sourceTree = "<group>"; };
+		E3D153DC16F815A8003BB796 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.md; sourceTree = "<group>"; };
+		E3D153DD16F815A8003BB796 /* SimpleAudioEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimpleAudioEngine.h; sourceTree = "<group>"; };
+		E3D153DE16F815A8003BB796 /* SimpleAudioEngine.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SimpleAudioEngine.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -1103,6 +1124,7 @@
 				E372D85C1657157C00DEEEC7 /* CCBReader */,
 				E37597E714FD224900CD9F5F /* LICENSE_cocos2d.txt */,
 				E375982814FD224A00CD9F5F /* LICENSE_Kazmath.txt */,
+				E3D153D016F815A8003BB796 /* CocosDenshion */,
 				E369DC9216B0973100772C3D /* cocos2d */,
 				E37597F714FD224900CD9F5F /* kazmath */,
 			);
@@ -1279,6 +1301,28 @@
 			name = Images;
 			sourceTree = "<group>";
 		};
+		E3D153D016F815A8003BB796 /* CocosDenshion */ = {
+			isa = PBXGroup;
+			children = (
+				E3D153D116F815A8003BB796 /* CDAudioManager.h */,
+				E3D153D216F815A8003BB796 /* CDAudioManager.m */,
+				E3D153D316F815A8003BB796 /* CDConfig.h */,
+				E3D153D416F815A8003BB796 /* CDOpenALSupport.h */,
+				E3D153D516F815A8003BB796 /* CDOpenALSupport.m */,
+				E3D153D616F815A8003BB796 /* CDXMacOSXSupport.h */,
+				E3D153D716F815A8003BB796 /* CDXMacOSXSupport.m */,
+				E3D153D816F815A8003BB796 /* CDXPropertyModifierAction.h */,
+				E3D153D916F815A8003BB796 /* CDXPropertyModifierAction.m */,
+				E3D153DA16F815A8003BB796 /* CocosDenshion.h */,
+				E3D153DB16F815A8003BB796 /* CocosDenshion.m */,
+				E3D153DC16F815A8003BB796 /* README.md */,
+				E3D153DD16F815A8003BB796 /* SimpleAudioEngine.h */,
+				E3D153DE16F815A8003BB796 /* SimpleAudioEngine.m */,
+			);
+			name = CocosDenshion;
+			path = libs/CocosDenshion;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -1401,6 +1445,7 @@
 				E372D8AE1657157C00DEEEC7 /* README.md in Resources */,
 				E372D8B01657157C00DEEEC7 /* README.md in Resources */,
 				E372D8B11657157C00DEEEC7 /* LICENSE in Resources */,
+				E3D153E416F815A8003BB796 /* README.md in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1545,6 +1590,12 @@
 				E369DDB616B0973200772C3D /* TGAlib.m in Sources */,
 				E369DDB716B0973200772C3D /* TransformUtils.m in Sources */,
 				E369DDB816B0973200772C3D /* ZipUtils.m in Sources */,
+				E3D153DF16F815A8003BB796 /* CDAudioManager.m in Sources */,
+				E3D153E016F815A8003BB796 /* CDOpenALSupport.m in Sources */,
+				E3D153E116F815A8003BB796 /* CDXMacOSXSupport.m in Sources */,
+				E3D153E216F815A8003BB796 /* CDXPropertyModifierAction.m in Sources */,
+				E3D153E316F815A8003BB796 /* CocosDenshion.m in Sources */,
+				E3D153E516F815A8003BB796 /* SimpleAudioEngine.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Examples/CocosBuilderExample/Resources/CocosBuilderExample.ccbproj

@@ -2,6 +2,14 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>deviceOrientationLandscapeLeft</key>
+	<false/>
+	<key>deviceOrientationLandscapeRight</key>
+	<false/>
+	<key>deviceOrientationPortrait</key>
+	<false/>
+	<key>deviceOrientationUpsideDown</key>
+	<false/>
 	<key>exporter</key>
 	<string>ccbi</string>
 	<key>fileType</key>
@@ -10,14 +18,54 @@
 	<integer>1</integer>
 	<key>flattenPaths</key>
 	<true/>
+	<key>generatedSpriteSheets</key>
+	<dict/>
 	<key>javascriptBased</key>
 	<false/>
+	<key>javascriptMainCCB</key>
+	<string></string>
 	<key>onlyPublishCCBs</key>
 	<true/>
 	<key>publishDirectory</key>
 	<string>.</string>
+	<key>publishDirectoryAndroid</key>
+	<string></string>
+	<key>publishDirectoryHTML5</key>
+	<string></string>
+	<key>publishEnabledAndroid</key>
+	<false/>
+	<key>publishEnabledHTML5</key>
+	<false/>
+	<key>publishEnablediPhone</key>
+	<true/>
+	<key>publishResolutionHTML5_height</key>
+	<integer>640</integer>
+	<key>publishResolutionHTML5_scale</key>
+	<integer>2</integer>
+	<key>publishResolutionHTML5_width</key>
+	<integer>960</integer>
+	<key>publishResolution_</key>
+	<true/>
+	<key>publishResolution_hd</key>
+	<false/>
+	<key>publishResolution_ipad</key>
+	<true/>
+	<key>publishResolution_ipadhd</key>
+	<false/>
+	<key>publishResolution_large</key>
+	<false/>
+	<key>publishResolution_medium</key>
+	<false/>
+	<key>publishResolution_small</key>
+	<false/>
+	<key>publishResolution_xlarge</key>
+	<false/>
+	<key>publishResolution_xsmall</key>
+	<false/>
 	<key>publishToZipFile</key>
 	<false/>
+	<key>resourceAutoScaleFactor</key>
+	<integer>4</integer>
 	<key>resourcePaths</key>
 	<array>
 		<dict>

Examples/CocosBuilderExample/Resources/fileLookup.plist

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>filenames</key>
+	<dict/>
+	<key>metadata</key>
+	<dict>
+		<key>version</key>
+		<integer>1</integer>
+	</dict>
+</dict>
+</plist>

Examples/CocosBuilderExample/libs/CocosDenshion

@@ -0,0 +1 @@
+../../../CocosBuilder/libs/cocos2d-iphone/CocosDenshion