Swift 1.2 fixes

Thanks to @jblocksom
Aaron-A-zz · Apr 11, 2015 · 00ef1fc · 00ef1fc
1 parent a110705
commit 00ef1fc
Show file tree

Hide file tree

Showing 56 changed files with 25 additions and 21 deletions.
diff --git a/Orbit 7.xcodeproj/project.pbxproj b/Orbit 7.xcodeproj/project.pbxproj
diff --git a/Orbit 7.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Orbit 7.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/Orbit 7.xcodeproj/project.xcworkspace/xcshareddata/Orbit 7.xccheckout b/Orbit 7.xcodeproj/project.xcworkspace/xcshareddata/Orbit 7.xccheckout
diff --git a/...deproj/project.xcworkspace/xcuserdata/Mav3r1ck.xcuserdatad/UserInterfaceState.xcuserstate b/...deproj/project.xcworkspace/xcuserdata/Mav3r1ck.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...codeproj/project.xcworkspace/xcuserdata/Mav3r1ck.xcuserdatad/WorkspaceSettings.xcsettings b/...codeproj/project.xcworkspace/xcuserdata/Mav3r1ck.xcuserdatad/WorkspaceSettings.xcsettings
@@ -0,0 +1,10 @@
+<?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>HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges</key>
+	<true/>
+	<key>SnapshotAutomaticallyBeforeSignificantChanges</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Orbit 7.xcodeproj/xcuserdata/Mav3r1ck.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Orbit 7.xcodeproj/xcuserdata/Mav3r1ck.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
diff --git a/Orbit 7.xcodeproj/xcuserdata/Mav3r1ck.xcuserdatad/xcschemes/Orbit 7.xcscheme b/Orbit 7.xcodeproj/xcuserdata/Mav3r1ck.xcuserdatad/xcschemes/Orbit 7.xcscheme
diff --git a/Orbit 7.xcodeproj/xcuserdata/Mav3r1ck.xcuserdatad/xcschemes/xcschememanagement.plist b/Orbit 7.xcodeproj/xcuserdata/Mav3r1ck.xcuserdatad/xcschemes/xcschememanagement.plist
diff --git a/Orbit 7/AppDelegate.swift b/Orbit 7/AppDelegate.swift
diff --git a/Orbit 7/Base.lproj/LaunchScreen.xib b/Orbit 7/Base.lproj/LaunchScreen.xib
diff --git a/Orbit 7/Base.lproj/Main.storyboard b/Orbit 7/Base.lproj/Main.storyboard
diff --git a/Orbit 7/GameOver.swift b/Orbit 7/GameOver.swift
diff --git a/Orbit 7/GameScene.sks b/Orbit 7/GameScene.sks
diff --git a/Orbit 7/GameScene.swift b/Orbit 7/GameScene.swift
@@ -108,14 +108,14 @@ class GameScene: SKScene {
         }
 
     }
-
 
 
     // Adding Touches
-    override func touchesBegan(touches: NSSet, withEvent event: UIEvent) {
+    override func touchesBegan(touches: Set<NSObject>, withEvent event: UIEvent) {
+
 
-        let location = touches.anyObject()?.locationInNode(self)
-        var node = self.nodeAtPoint(location!)
+        let location = (touches.first as? UITouch)?.locationInNode(self)
+        let node = self.nodeAtPoint(location!)
 
         // Particles
         func explosion() {
@@ -208,10 +208,9 @@ class GameScene: SKScene {
 
     }
 
-
-    override func touchesEnded(touches: NSSet, withEvent event: UIEvent) {
+    override func touchesEnded(touches: Set<NSObject>, withEvent event: UIEvent) {
         let dropDown = SKAction.scaleTo(1.0, duration: 0.2)
-
     }
 
+
 }
diff --git a/Orbit 7/GameViewController.swift b/Orbit 7/GameViewController.swift
@@ -11,12 +11,12 @@ import SpriteKit
 
 extension SKNode {
     class func unarchiveFromFile(file : NSString) -> SKNode? {
-        if let path = NSBundle.mainBundle().pathForResource(file, ofType: "sks") {
+        if let path = NSBundle.mainBundle().pathForResource(file as String, ofType: "sks") {
             var sceneData = NSData(contentsOfFile: path, options: .DataReadingMappedIfSafe, error: nil)!
             var archiver = NSKeyedUnarchiver(forReadingWithData: sceneData)
 
             archiver.setClass(self.classForKeyedUnarchiver(), forClassName: "SKScene")
-            let scene = archiver.decodeObjectForKey(NSKeyedArchiveRootObjectKey) as Menu
+            let scene = archiver.decodeObjectForKey(NSKeyedArchiveRootObjectKey) as! Menu
             archiver.finishDecoding()
             return scene
         } else {
@@ -33,7 +33,7 @@ class GameViewController: UIViewController {
 
         if let scene = Menu.unarchiveFromFile("GameScene") as? Menu {
             // Configure the view.
-            let skView = self.view as SKView
+            let skView = self.view as! SKView
             skView.showsFPS = false
             skView.showsNodeCount = false
 

diff --git a/Orbit 7/Images.xcassets/AppIcon.appiconset/Contents.json b/Orbit 7/Images.xcassets/AppIcon.appiconset/Contents.json
diff --git a/Orbit 7/Images.xcassets/AppIcon.appiconset/icon.png b/Orbit 7/Images.xcassets/AppIcon.appiconset/icon.png
diff --git a/Orbit 7/Images.xcassets/AppIcon.appiconset/icon@2x.png b/Orbit 7/Images.xcassets/AppIcon.appiconset/icon@2x.png
diff --git a/Orbit 7/Info.plist b/Orbit 7/Info.plist
diff --git a/Orbit 7/Menu.swift b/Orbit 7/Menu.swift
@@ -133,13 +133,14 @@ class Menu: SKScene {
 
 
     // Game Levels
-    override func touchesBegan(touches: NSSet, withEvent event: UIEvent) {
-        let location = touches.anyObject()?.locationInNode(self)
-        var node = self.nodeAtPoint(location!)
-        audioPlayer.stop()
+    override func touchesBegan(touches: Set<NSObject>, withEvent event: UIEvent) {
 
+        let touchLocation = (touches.first as? UITouch)?.locationInNode(self)
+        let node = self.nodeAtPoint(touchLocation!)
 
+        audioPlayer.stop()
 
+
         if node.name == "Sun" {
 
             runAction(SKAction.sequence([

diff --git a/Orbit 7/Shapes.swift b/Orbit 7/Shapes.swift
diff --git a/Orbit 7/Spiraling.wav b/Orbit 7/Spiraling.wav
diff --git a/Orbit 7/Stars.sks b/Orbit 7/Stars.sks
diff --git a/Orbit 7/asteroid2.png b/Orbit 7/asteroid2.png
diff --git a/Orbit 7/blackAsteroidL.png b/Orbit 7/blackAsteroidL.png
diff --git a/Orbit 7/blackAsteroidM.png b/Orbit 7/blackAsteroidM.png
diff --git a/Orbit 7/blackAsteroidS.png b/Orbit 7/blackAsteroidS.png
diff --git a/Orbit 7/blueAsteroidL.png b/Orbit 7/blueAsteroidL.png
diff --git a/Orbit 7/blueAsteroidM.png b/Orbit 7/blueAsteroidM.png
diff --git a/Orbit 7/blueAsteroidS.png b/Orbit 7/blueAsteroidS.png
diff --git a/Orbit 7/blueDot@2x.png b/Orbit 7/blueDot@2x.png
diff --git a/Orbit 7/greenAsteroidL.png b/Orbit 7/greenAsteroidL.png
diff --git a/Orbit 7/greenAsteroidM.png b/Orbit 7/greenAsteroidM.png
diff --git a/Orbit 7/greenAsteroidS.png b/Orbit 7/greenAsteroidS.png
diff --git a/Orbit 7/greenDot.png b/Orbit 7/greenDot.png
diff --git a/Orbit 7/greenDot@2x.png b/Orbit 7/greenDot@2x.png
diff --git a/Orbit 7/menuTest.png b/Orbit 7/menuTest.png
diff --git a/Orbit 7/purpleAsteroidL.png b/Orbit 7/purpleAsteroidL.png
diff --git a/Orbit 7/purpleAsteroidM.png b/Orbit 7/purpleAsteroidM.png
diff --git a/Orbit 7/purpleAsteroidS.png b/Orbit 7/purpleAsteroidS.png
diff --git a/Orbit 7/purpleDot@2x.png b/Orbit 7/purpleDot@2x.png
diff --git a/Orbit 7/redAsteroidL.png b/Orbit 7/redAsteroidL.png
diff --git a/Orbit 7/redAsteroidM.png b/Orbit 7/redAsteroidM.png
diff --git a/Orbit 7/redAsteroidS.png b/Orbit 7/redAsteroidS.png
diff --git a/Orbit 7/redDot@2x.png b/Orbit 7/redDot@2x.png
diff --git a/Orbit 7/satelliteL.png b/Orbit 7/satelliteL.png
diff --git a/Orbit 7/satelliteM.png b/Orbit 7/satelliteM.png
diff --git a/Orbit 7/satelliteS.png b/Orbit 7/satelliteS.png
diff --git a/Orbit 7/sunDot.png b/Orbit 7/sunDot.png
diff --git a/Orbit 7/sunDot@2x.png b/Orbit 7/sunDot@2x.png
diff --git a/Orbit 7/zapzap.wav b/Orbit 7/zapzap.wav
diff --git a/Orbit 7Tests/Info.plist b/Orbit 7Tests/Info.plist
diff --git a/Orbit 7Tests/Orbit_7Tests.swift b/Orbit 7Tests/Orbit_7Tests.swift
diff --git a/ParticleFire.sks b/ParticleFire.sks
diff --git a/README.md b/README.md
@@ -1,10 +1,4 @@
 # Orbit7
 Open Source iOS Game created in SpriteKit with Swift
-<center>
-![alt tag](https://www.mav3r1ck.com/content/images/2015/03/iTunesArtwork-2x-4.png)
-</center>
-<br>
-<center>
-https://itunes.apple.com/us/app/orbit-7/id959313456 </center>
-
 
+![alt tag](http://s29.postimg.org/n9l6zppd1/Shapes.gif)
diff --git a/spark.png b/spark.png