diff --git a/.DS_Store b/.DS_Store index 25ee8133558e0a5ec26185307c044335f80b8516..9871fbd2cf2259027eb260b5bf3cac7f15823402 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Pendu.xcodeproj/project.pbxproj b/Pendu.xcodeproj/project.pbxproj index a64ee7583a1761dd035d3b9ee3a73817afc99ce7..51ea773b43a21e6afec9e8b74734bb02fe348433 100644 --- a/Pendu.xcodeproj/project.pbxproj +++ b/Pendu.xcodeproj/project.pbxproj @@ -18,13 +18,16 @@ BF3C48282A0A1FCD00CE128F /* PenduTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF3C48272A0A1FCD00CE128F /* PenduTests.swift */; }; BF3C48322A0A1FCD00CE128F /* PenduUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF3C48312A0A1FCD00CE128F /* PenduUITests.swift */; }; BF3C48342A0A1FCD00CE128F /* PenduUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF3C48332A0A1FCD00CE128F /* PenduUITestsLaunchTests.swift */; }; - F817CE932A13B9DD0078F0A5 /* whatever it takes.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F817CE922A13B9DC0078F0A5 /* whatever it takes.ttf */; }; - F8B49FB42A25E67600750A52 /* Game.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BF3C48132A0A1FCA00CE128F /* Game.storyboard */; }; BF3C48432A0A3CFF00CE128F /* GameEngineTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF3C48422A0A3CFF00CE128F /* GameEngineTests.swift */; }; BF7F866E2A1CF44B0063A152 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF3C480D2A0A1FCA00CE128F /* AppDelegate.swift */; }; D082CCC92A0A33D600D97981 /* GameEngine.swift in Sources */ = {isa = PBXBuildFile; fileRef = D082CCC82A0A33D600D97981 /* GameEngine.swift */; }; D082CCCA2A0A33D600D97981 /* GameEngine.swift in Sources */ = {isa = PBXBuildFile; fileRef = D082CCC82A0A33D600D97981 /* GameEngine.swift */; }; D082CCCB2A0A33D600D97981 /* GameEngine.swift in Sources */ = {isa = PBXBuildFile; fileRef = D082CCC82A0A33D600D97981 /* GameEngine.swift */; }; + D0D074F32A25F3BB00526851 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0D074F22A25F3BB00526851 /* ViewController.swift */; }; + D0D074F62A25F3DA00526851 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D0D074F42A25F3DA00526851 /* Main.storyboard */; }; + D0D074F82A25F3EB00526851 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0D074F72A25F3EB00526851 /* ViewController.swift */; }; + F817CE932A13B9DD0078F0A5 /* whatever it takes.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F817CE922A13B9DC0078F0A5 /* whatever it takes.ttf */; }; + F8B49FB42A25E67600750A52 /* Game.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BF3C48132A0A1FCA00CE128F /* Game.storyboard */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -60,10 +63,13 @@ BF3C482D2A0A1FCD00CE128F /* PenduUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PenduUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; BF3C48312A0A1FCD00CE128F /* PenduUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PenduUITests.swift; sourceTree = "<group>"; }; BF3C48332A0A1FCD00CE128F /* PenduUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PenduUITestsLaunchTests.swift; sourceTree = "<group>"; }; - F817CE922A13B9DC0078F0A5 /* whatever it takes.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "whatever it takes.ttf"; sourceTree = "<group>"; }; BF3C48422A0A3CFF00CE128F /* GameEngineTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameEngineTests.swift; sourceTree = "<group>"; }; BF5A7EC82A13BF8A00168B16 /* GameEngineMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameEngineMock.swift; sourceTree = "<group>"; }; D082CCC82A0A33D600D97981 /* GameEngine.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GameEngine.swift; sourceTree = "<group>"; }; + D0D074F22A25F3BB00526851 /* ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ViewController.swift; path = Pendu/ViewController.swift; sourceTree = SOURCE_ROOT; }; + D0D074F52A25F3DA00526851 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; }; + D0D074F72A25F3EB00526851 /* ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; }; + F817CE922A13B9DC0078F0A5 /* whatever it takes.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "whatever it takes.ttf"; sourceTree = "<group>"; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -118,7 +124,9 @@ BF3C480D2A0A1FCA00CE128F /* AppDelegate.swift */, BF3C480F2A0A1FCA00CE128F /* SceneDelegate.swift */, BF3C48112A0A1FCA00CE128F /* GameViewController.swift */, + D0D074F72A25F3EB00526851 /* ViewController.swift */, BF3C48132A0A1FCA00CE128F /* Game.storyboard */, + D0D074F42A25F3DA00526851 /* Main.storyboard */, BF3C48192A0A1FCD00CE128F /* Assets.xcassets */, BF3C481B2A0A1FCD00CE128F /* LaunchScreen.storyboard */, BF3C481E2A0A1FCD00CE128F /* Info.plist */, @@ -151,6 +159,7 @@ F817CE912A13B99F0078F0A5 /* Font */ = { isa = PBXGroup; children = ( + D0D074F22A25F3BB00526851 /* ViewController.swift */, F817CE922A13B9DC0078F0A5 /* whatever it takes.ttf */, ); path = Font; @@ -261,11 +270,10 @@ buildActionMask = 2147483647; files = ( F8B49FB42A25E67600750A52 /* Game.storyboard in Resources */, + D0D074F62A25F3DA00526851 /* Main.storyboard in Resources */, F817CE932A13B9DD0078F0A5 /* whatever it takes.ttf in Resources */, BF3C481D2A0A1FCD00CE128F /* LaunchScreen.storyboard in Resources */, BF3C481A2A0A1FCD00CE128F /* Assets.xcassets in Resources */, - 157E41DB2A1D136300E6DE57 /* zadi.jpeg in Resources */, - BF3C48152A0A1FCA00CE128F /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -292,9 +300,11 @@ files = ( BF3C48122A0A1FCA00CE128F /* GameViewController.swift in Sources */, D082CCC92A0A33D600D97981 /* GameEngine.swift in Sources */, - BF3C48122A0A1FCA00CE128F /* ViewController.swift in Sources */, + BF3C48122A0A1FCA00CE128F /* GameViewController.swift in Sources */, BF3C480E2A0A1FCA00CE128F /* AppDelegate.swift in Sources */, + D0D074F32A25F3BB00526851 /* ViewController.swift in Sources */, BF3C48182A0A1FCA00CE128F /* Pendu.xcdatamodeld in Sources */, + D0D074F82A25F3EB00526851 /* ViewController.swift in Sources */, BF3C48102A0A1FCA00CE128F /* SceneDelegate.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -354,6 +364,14 @@ name = LaunchScreen.storyboard; sourceTree = "<group>"; }; + D0D074F42A25F3DA00526851 /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + D0D074F52A25F3DA00526851 /* Base */, + ); + name = Main.storyboard; + sourceTree = "<group>"; + }; /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ diff --git a/Pendu/GameViewController.swift b/Pendu/GameViewController.swift index 17e9d49b1f914982de2a884341ddbc172480772a..92909b80beb84117a6f619874da5908419a8026a 100644 --- a/Pendu/GameViewController.swift +++ b/Pendu/GameViewController.swift @@ -28,7 +28,7 @@ extension UIView { } } -class ViewController: UIViewController { +class GameViewController: UIViewController { let mainstoryboard = UIStoryboard(name: "Game", bundle: nil)