diff --git a/README.md b/README.md index ed88c57..5603870 100644 --- a/README.md +++ b/README.md @@ -23,9 +23,7 @@ Currently, there aren't any releases ready. If you prefer testing builds, you may want to consider the [Termina for macOS Beta Program](https://terminagame.github.io/mac/tutoriel.html). ## Building from source -This project makes use of CocoaPods and the AppCenter framework to compile and run this game. These frameworks are usually used for the Beta Program and its analytic features. -1. Clone the project locally and ensure that you have installed CocoaPods (if you use Homebrew, type `brew install cocoapods` in a terminal). -2. In a terminal, type `pod install` to install the framework. -3. Open the _workspace_ in Xcode and change the developer signing to your own account. -4. Build and run the application. If you want to make a _release_ rather than a _debug_ version, change the scheme from 'Termina' to 'Termina (Release)'. \ No newline at end of file +1. Clone the project locally. +2. Open the project in Xcode and change the developer signing to your own account. +3. Build and run the application. If you want to make a _release_ rather than a _debug_ version, change the scheme from 'Termina' to 'Termina (Release)'. diff --git a/Termina.xcodeproj/project.pbxproj b/Termina.xcodeproj/project.pbxproj index d6c4328..353d990 100644 --- a/Termina.xcodeproj/project.pbxproj +++ b/Termina.xcodeproj/project.pbxproj @@ -89,6 +89,7 @@ BF90A4C921C03D8100F64D5D /* GhostMenuMusic.aif in Resources */ = {isa = PBXBuildFile; fileRef = BF90A4C821C03D8100F64D5D /* GhostMenuMusic.aif */; }; BFA433C621B2FCA200E6FB45 /* BetaHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFA433C521B2FCA200E6FB45 /* BetaHandler.swift */; }; BFBE9C1221B5E6A300AA1C6C /* BetaProgramPane.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFBE9C1021B5E6A300AA1C6C /* BetaProgramPane.swift */; }; + BFD29703251FDAE70013E179 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = BFD29702251FDAE70013E179 /* README.md */; }; BFF9FBBB21B320FB001DAAC9 /* Tutorial.sks in Resources */ = {isa = PBXBuildFile; fileRef = BFF9FBBA21B320FB001DAAC9 /* Tutorial.sks */; }; BFF9FBBD21B329AB001DAAC9 /* TutorialRoomScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFF9FBBC21B329AB001DAAC9 /* TutorialRoomScene.swift */; }; /* End PBXBuildFile section */ @@ -185,7 +186,6 @@ BF4AC24821C2A75B0050ACE7 /* NPC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NPC.swift; sourceTree = ""; }; BF4AC24A21C2B7F60050ACE7 /* Speech.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Speech.swift; sourceTree = ""; }; BF4AC24E21C2E5700050ACE7 /* GeneralPane.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeneralPane.swift; sourceTree = ""; }; - BF4AC25221C2E7010050ACE7 /* Termina macOS Beta Program.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = "Termina macOS Beta Program.rtf"; path = "../../../../../Library/Mobile Documents/com~apple~TextEdit/Documents/Termina macOS Beta Program.rtf"; sourceTree = ""; }; BF4CA6BA21B5B01E007A39F1 /* Preferences.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Preferences.storyboard; sourceTree = ""; }; BF4CA6BC21B5B500007A39F1 /* PreferencesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesViewController.swift; sourceTree = ""; }; BF4CA6BE21B5B59D007A39F1 /* PreferencesWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesWindowController.swift; sourceTree = ""; }; @@ -198,6 +198,7 @@ BFA433C521B2FCA200E6FB45 /* BetaHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BetaHandler.swift; sourceTree = ""; }; BFBC47A121C2A710002A6C28 /* Termina macOS Beta Program.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = "Termina macOS Beta Program.rtf"; sourceTree = ""; }; BFBE9C1021B5E6A300AA1C6C /* BetaProgramPane.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BetaProgramPane.swift; sourceTree = ""; }; + BFD29702251FDAE70013E179 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; BFF9FBBA21B320FB001DAAC9 /* Tutorial.sks */ = {isa = PBXFileReference; lastKnownFileType = file.sks; path = Tutorial.sks; sourceTree = ""; }; BFF9FBBC21B329AB001DAAC9 /* TutorialRoomScene.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TutorialRoomScene.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -220,6 +221,7 @@ BF082D3B21AC99FF00B5406C = { isa = PBXGroup; children = ( + BFD29702251FDAE70013E179 /* README.md */, BF082D4621AC99FF00B5406C /* Termina */, BF082D4521AC99FF00B5406C /* Products */, BF082DAC21AC9EA900B5406C /* Frameworks */, @@ -420,7 +422,6 @@ BFBC47A021C2A708002A6C28 /* Documents */ = { isa = PBXGroup; children = ( - BF4AC25221C2E7010050ACE7 /* Termina macOS Beta Program.rtf */, BF082DB121AD8CC100B5406C /* About.rtf */, BFBC47A121C2A710002A6C28 /* Termina macOS Beta Program.rtf */, ); @@ -545,6 +546,7 @@ BF082D8B21AC9A4500B5406C /* Main.storyboard in Resources */, BF1408A821B09B9800A7E70E /* 9.sks in Resources */, BF1408A121B09B9800A7E70E /* 15.sks in Resources */, + BFD29703251FDAE70013E179 /* README.md in Resources */, BF14089E21B09B9800A7E70E /* 3.sks in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -733,6 +735,7 @@ CODE_SIGN_IDENTITY = "Mac Developer"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; + CURRENT_PROJECT_VERSION = 3; DEVELOPMENT_TEAM = FQQXSP79X3; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = Termina/Info.plist; @@ -756,6 +759,7 @@ CODE_SIGN_IDENTITY = "Mac Developer"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; + CURRENT_PROJECT_VERSION = 3; DEVELOPMENT_TEAM = FQQXSP79X3; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = Termina/Info.plist; diff --git a/Termina.xcodeproj/project.xcworkspace/xcuserdata/marquiskurt.xcuserdatad/UserInterfaceState.xcuserstate b/Termina.xcodeproj/project.xcworkspace/xcuserdata/marquiskurt.xcuserdatad/UserInterfaceState.xcuserstate index b8534f6..3a700d4 100644 Binary files a/Termina.xcodeproj/project.xcworkspace/xcuserdata/marquiskurt.xcuserdatad/UserInterfaceState.xcuserstate and b/Termina.xcodeproj/project.xcworkspace/xcuserdata/marquiskurt.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Termina.xcodeproj/xcuserdata/marquiskurt.xcuserdatad/xcschemes/xcschememanagement.plist b/Termina.xcodeproj/xcuserdata/marquiskurt.xcuserdatad/xcschemes/xcschememanagement.plist index f82c56a..552a4d6 100644 --- a/Termina.xcodeproj/xcuserdata/marquiskurt.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/Termina.xcodeproj/xcuserdata/marquiskurt.xcuserdatad/xcschemes/xcschememanagement.plist @@ -4,6 +4,27 @@ SchemeUserState + Playground (Playground) 1.xcscheme + + isShown + + orderHint + 3 + + Playground (Playground) 2.xcscheme + + isShown + + orderHint + 4 + + Playground (Playground).xcscheme + + isShown + + orderHint + 2 + Termina (Release).xcscheme orderHint diff --git a/Termina/Info.plist b/Termina/Info.plist index 84263a8..5a96ada 100644 --- a/Termina/Info.plist +++ b/Termina/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.0 CFBundleVersion - beta2 + $(CURRENT_PROJECT_VERSION) LSApplicationCategoryType public.app-category.games LSMinimumSystemVersion diff --git a/Termina/Preferences/BetaProgramPane.swift b/Termina/Preferences/BetaProgramPane.swift index 70c8855..08c0fb6 100644 --- a/Termina/Preferences/BetaProgramPane.swift +++ b/Termina/Preferences/BetaProgramPane.swift @@ -10,7 +10,7 @@ import Cocoa class BetaProgramPane: PreferencesViewController { - @IBOutlet weak var sendAnalytics: NSButton! +// @IBOutlet weak var sendAnalytics: NSButton! @IBOutlet weak var demoMode: NSButton! override func viewDidLoad() { @@ -30,11 +30,11 @@ class BetaProgramPane: PreferencesViewController { } override func viewDidDisappear() { - if sendAnalytics.state == .on { - TerminaUserDefaults().setBetaAnalytics(status: true) - } else { - TerminaUserDefaults().setBetaAnalytics(status: false) - } +// if sendAnalytics.state == .on { +// TerminaUserDefaults().setBetaAnalytics(status: true) +// } else { +// TerminaUserDefaults().setBetaAnalytics(status: false) +// } if demoMode.state == .on { TerminaUserDefaults().toggleDemoMode(status: true) diff --git a/Termina/Storyboards/Base.lproj/Main.storyboard b/Termina/Storyboards/Base.lproj/Main.storyboard index 467f809..0c85f47 100644 --- a/Termina/Storyboards/Base.lproj/Main.storyboard +++ b/Termina/Storyboards/Base.lproj/Main.storyboard @@ -1,7 +1,8 @@ - + - + + @@ -178,7 +179,7 @@ - +