Merge pull request #618 from KoboldKit/develop-steffen

update Sprite Kit project & reader to v10
spritebuilder · Jun 13, 2014 · e0b3aa7 · e0b3aa7
2 parents 29c4c2b + 4304a08
commit e0b3aa7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 17 deletions.
diff --git a/SpriteBuilder/libs/SpriteKit b/SpriteBuilder/libs/SpriteKit
diff --git a/Support/SPRITEKITPROJECTNAME.spritebuilder/SPRITEKITPROJECTNAME.ccbproj b/Support/SPRITEKITPROJECTNAME.spritebuilder/SPRITEKITPROJECTNAME.ccbproj
@@ -28,10 +28,6 @@
 	<integer>1</integer>
 	<key>flattenPaths</key>
 	<false/>
-	<key>javascriptBased</key>
-	<true/>
-	<key>javascriptMainCCB</key>
-	<string>MainScene</string>
 	<key>needRepublish</key>
 	<false/>
 	<key>onlyPublishCCBs</key>
@@ -44,22 +40,12 @@
 	<string>Source/Resources/Published-iOS</string>
 	<key>publishDirectoryAndroid</key>
 	<string>Source/Resources/Published-Android</string>
-	<key>publishDirectoryHTML5</key>
-	<string>Published-HTML5</string>
 	<key>publishEnabledAndroid</key>
 	<true/>
-	<key>publishEnabledHTML5</key>
-	<false/>
 	<key>publishEnablediPhone</key>
 	<true/>
 	<key>publishEnvironment</key>
 	<integer>0</integer>
-	<key>publishResolutionHTML5_height</key>
-	<integer>320</integer>
-	<key>publishResolutionHTML5_scale</key>
-	<integer>1</integer>
-	<key>publishResolutionHTML5_width</key>
-	<integer>480</integer>
 	<key>publishResolution_android_phone</key>
 	<true/>
 	<key>publishResolution_android_phonehd</key>
@@ -180,8 +166,8 @@
 		</dict>
 	</dict>
 	<key>versionStr</key>
-	<string>Version: 1.1.0.beta.0
-GitHub: 0b75c8e7d0
+	<string>Version: 1.1
+GitHub: 9c44f4f41e
 </string>
 </dict>
 </plist>
diff --git a/Support/SPRITEKITPROJECTNAME.spritebuilder/Source/Resources/Published-iOS/MainScene.ccbi b/Support/SPRITEKITPROJECTNAME.spritebuilder/Source/Resources/Published-iOS/MainScene.ccbi
+89 −46		CCBReader/CCBReader.m
+1 −1		CCBReader/CCBReader_Private.h
+ −		tests/RealWorldTestProject.spritebuilder/Source/Resources/Published-iOS/die.m4a