Merge pull request #63 from BenLeggiero/develop

Sync develop into master
BlueHuskyStudios · Feb 16, 2020 · 45bed23 · 45bed23
2 parents fcdeb84 + a60cd4f
commit 45bed23
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/Swift Mines/Shared Cross-Platform/GUI/SwiftUI/FirstTimeDisclaimerView.swift b/Swift Mines/Shared Cross-Platform/GUI/SwiftUI/FirstTimeDisclaimerView.swift
@@ -20,17 +20,15 @@ public struct FirstTimeDisclaimerView: View {
 
     public var body: some View {
         Form {
-            Text("Thanks for trying out this early version of Swift Mines!")
+            Text("Welcome to Swift Mines!")
                 .font(.title)
 
             Spacer()
                 .fixedSize()
 
             Text("""
-                This was written entirely in Swift, using the new SwiftUI platform! Since SwiftUI is in its early stages, it has a few odd quirks. One that you'll notice is that it does not yet support \(phrase_secondaryClicking). For now, you can hold Control and click, or perform a long-click, to place a flag. Once SwiftUI supports \(phrase_secondaryClicking), this game will be update to include that.
-
-                If you notice any other bugs, feel free to report them by selecting the "Feedback" item in the Help menu.
-
+                This was written entirely in Swift, using the new SwiftUI platform! Since SwiftUI is in its early stages, SwiftUI has a few odd quirks. One that you'll notice is that it does not yet support \(phrase_secondaryClicking). Instead, to place a flag, you can hold Control and click, or perform a long-click. Once SwiftUI supports \(phrase_secondaryClicking), this game will be updated to include that.
+                
                 Have fun!
                 """)
 

diff --git a/Swift Mines/Swift Mines.xcodeproj/project.pbxproj b/Swift Mines/Swift Mines.xcodeproj/project.pbxproj
@@ -895,7 +895,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_ASSET_PATHS = "\"Swift Mines for macOS/Preview Content\"";
 				DEVELOPMENT_TEAM = 26V9MK8TGP;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -906,7 +906,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.0.3;
+				MARKETING_VERSION = 1.0.4;
 				PRODUCT_BUNDLE_IDENTIFIER = "me.benleggiero.Swift-Mines";
 				PRODUCT_NAME = "Swift Mines";
 				SWIFT_VERSION = 5.0;
@@ -921,7 +921,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_ASSET_PATHS = "\"Swift Mines for macOS/Preview Content\"";
 				DEVELOPMENT_TEAM = 26V9MK8TGP;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -932,7 +932,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.0.3;
+				MARKETING_VERSION = 1.0.4;
 				PRODUCT_BUNDLE_IDENTIFIER = "me.benleggiero.Swift-Mines";
 				PRODUCT_NAME = "Swift Mines";
 				SWIFT_VERSION = 5.0;