Merge pull request #16 from sethhoward/release/1.3.1

Fix for Game Center. Fix for iOS 9 arrays not being populated. Fix fo…
sethhoward · Oct 9, 2018 · f58eaf9 · f58eaf9
2 parents 526ce68 + 6cecd7a
commit f58eaf9
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 30 deletions.
diff --git a/iBrogue_iPad.xcodeproj/project.pbxproj b/iBrogue_iPad.xcodeproj/project.pbxproj
@@ -606,7 +606,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "iBrogue_iPad/iBrogue_iPad-Prefix.pch";
 				INFOPLIST_FILE = "iBrogue_iPad/iBrogue_iPad-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = SethHoward.iBrogue;
@@ -641,7 +641,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "iBrogue_iPad/iBrogue_iPad-Prefix.pch";
 				INFOPLIST_FILE = "iBrogue_iPad/iBrogue_iPad-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = SethHoward.iBrogue;

diff --git a/iBrogue_iPad.xcodeproj/xcuserdata/sethhoward.xcuserdatad/xcschemes/Distribute.xcscheme b/iBrogue_iPad.xcodeproj/xcuserdata/sethhoward.xcuserdatad/xcschemes/Distribute.xcscheme
@@ -43,8 +43,8 @@
    </TestAction>
    <LaunchAction
       buildConfiguration = "Release"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      selectedDebuggerIdentifier = ""
+      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/iBrogue_iPad.xcodeproj/xcuserdata/sethhoward.xcuserdatad/xcschemes/xcschememanagement.plist b/iBrogue_iPad.xcodeproj/xcuserdata/sethhoward.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -6,6 +6,8 @@
 	<dict>
 		<key>Brogue.xcscheme</key>
 		<dict>
+			<key>isShown</key>
+			<false/>
 			<key>orderHint</key>
 			<integer>3</integer>
 		</dict>
@@ -19,11 +21,6 @@
 			<key>orderHint</key>
 			<integer>0</integer>
 		</dict>
-		<key>iBrogue_iPad_what.xcscheme</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>2</integer>
-		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>
 	<dict>

diff --git a/iBrogue_iPad/Images.xcassets/AppIcon.appiconset/Brogue Icon.png b/iBrogue_iPad/Images.xcassets/AppIcon.appiconset/Brogue Icon.png
diff --git a/iBrogue_iPad/Images.xcassets/AppIcon.appiconset/Contents.json b/iBrogue_iPad/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -52,6 +52,12 @@
       "filename" : "Icon-167.png",
       "scale" : "2x"
     },
+    {
+      "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "Brogue Icon.png",
+      "scale" : "1x"
+    },
     {
       "idiom" : "car",
       "size" : "60x60",

diff --git a/iBrogue_iPad/Main.storyboard b/iBrogue_iPad/Main.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12120" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="Aj1-6Q-hr4">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="Aj1-6Q-hr4">
     <device id="ipad12_9" orientation="landscape">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
-        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -243,7 +243,7 @@
                                     <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 </state>
                                 <connections>
-                                    <action selector="seedButtonPressed:" destination="Aj1-6Q-hr4" eventType="touchUpOutside" id="TdT-jc-XEl"/>
+                                    <action selector="seedButtonPressed:" destination="Aj1-6Q-hr4" eventType="touchUpInside" id="J1u-kC-IQf"/>
                                 </connections>
                             </button>
                         </subviews>

diff --git a/iBrogue_iPad/PlatformCode/BrogueViewController.swift b/iBrogue_iPad/PlatformCode/BrogueViewController.swift
@@ -49,9 +49,9 @@ extension String {
 
 // MARK: - UIBrogueTouchEvent
 
-final class UIBrogueTouchEvent: NSObject, NSCopying {
-    let phase: UITouch.Phase
-    let location: CGPoint
+@objc class UIBrogueTouchEvent: NSObject, NSCopying {
+    @objc let phase: UITouch.Phase
+    @objc let location: CGPoint
 
     required init(phase: UITouch.Phase, location: CGPoint) {
         self.phase = phase
@@ -111,8 +111,8 @@ final class BrogueViewController: UIViewController {
     @IBOutlet fileprivate weak var leaderBoardButton: UIButton!
     @IBOutlet fileprivate weak var seedButton: UIButton!
 
-    var seedKeyDown = false
-    var lastBrogueGameEvent: BrogueGameEvent = .showTitle {
+    @objc var seedKeyDown = false
+    @objc var lastBrogueGameEvent: BrogueGameEvent = .showTitle {
         didSet {
             DispatchQueue.main.async {
                 switch self.lastBrogueGameEvent {
@@ -152,6 +152,8 @@ final class BrogueViewController: UIViewController {
         magView.viewToMagnify = skViewPort
         magView.hideMagnifier()
         inputTextField.delegate = self
+
+        GameCenterManager.sharedInstance()?.authenticateLocalUser()
     }
 
     override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
@@ -287,7 +289,7 @@ extension BrogueViewController {
         }
     }
 
-    func dequeTouchEvent() -> UIBrogueTouchEvent? {
+    @objc func dequeTouchEvent() -> UIBrogueTouchEvent? {
         var event: UIBrogueTouchEvent?
 
         synchronized(touchEvents) {
@@ -300,7 +302,7 @@ extension BrogueViewController {
         return event
     }
 
-    func hasTouchEvent() -> Bool {
+    @objc func hasTouchEvent() -> Bool {
         return !touchEvents.isEmpty
     }
 }
@@ -383,7 +385,7 @@ extension BrogueViewController {
     }
 
     // cannot be optional for backward compat
-    func dequeKeyEvent() -> UInt8 {
+    @objc func dequeKeyEvent() -> UInt8 {
         var event: UInt8!
 
         synchronized(keyEvents) {
@@ -397,6 +399,7 @@ extension BrogueViewController {
         return event
     }
 
+    @objc(hasKeyEvent)
     func hasKeyEvent() -> Bool {
         return !keyEvents.isEmpty
     }

diff --git a/iBrogue_iPad/PlatformCode/RogueDriver.mm b/iBrogue_iPad/PlatformCode/RogueDriver.mm
@@ -154,8 +154,8 @@ void nextKeyOrMouseEvent(rogueEvent *returnEvent, __unused boolean textInput, bo
                         break;
                 }
 
-                x = COLS * touch.location.x / width;
-                y = ROWS * touch.location.y / height;
+                x = COLS * float(touch.location.x) / width;
+                y = ROWS * float(touch.location.y) / height;
 
                 returnEvent->param1 = x;
                 returnEvent->param2 = y;

diff --git a/iBrogue_iPad/PlatformCode/RogueScene.swift b/iBrogue_iPad/PlatformCode/RogueScene.swift
@@ -38,7 +38,7 @@ extension CGSize {
 
 // To see Swift classes from ObjC they MUST be prefaced with @objc and be public/open
 @objc public class RogueScene: SKScene {
-    fileprivate let grid: CGSize
+    fileprivate let gridSize: CGSize
     fileprivate let cellSize: CGSize
 
     fileprivate var fgTextures = [SKTexture]()
@@ -57,9 +57,14 @@ extension CGSize {
     }()
 
     public init(size: CGSize, rows: Int, cols: Int) {
-        grid = CGSize(rows: rows, cols: cols)
+        gridSize = CGSize(rows: rows, cols: cols)
         cellSize = CGSize(width: CGFloat(size.width) / CGFloat(cols), height: CGFloat(size.height) / CGFloat(rows))
         super.init(size: size)
+
+        if #available(iOS 10.0, *) {}
+        else {
+            sceneDidLoad()
+        }
     }
 
     required public init?(coder aDecoder: NSCoder) {
@@ -78,10 +83,10 @@ extension RogueScene {
     }
 
     override public func sceneDidLoad() {
-        for x in 0...grid.cols {
+        for x in 0...gridSize.cols {
             var row = [Cell]()
-            for y in 0...grid.rows {
-                let newCell = Cell(x: CGFloat(x) * cellSize.width, y: CGFloat(grid.rows - y - 1) * cellSize.height, size: CGSize(width: cellSize.width, height: cellSize.height))
+            for y in 0...gridSize.rows {
+                let newCell = Cell(x: CGFloat(x) * cellSize.width, y: CGFloat(gridSize.rows - y - 1) * cellSize.height, size: CGSize(width: cellSize.width, height: cellSize.height))
                 row.append(newCell)
             }
             cells.append(row)

diff --git a/iBrogue_iPad/PlatformCode/SKViewPort.swift b/iBrogue_iPad/PlatformCode/SKViewPort.swift
@@ -34,7 +34,7 @@ class SKViewPort: SKView {
         rogueScene.scaleMode = .fill
         super.init(coder: aDecoder)
 
-      //  showsFPS = true
+       // showsFPS = true
       //  showsNodeCount = true
         ignoresSiblingOrder = true
     }

diff --git a/iBrogue_iPad/iBrogue_iPad-Info.plist b/iBrogue_iPad/iBrogue_iPad-Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.5</string>
+	<string>1.3.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>