diff --git a/ARCHBLOX.xcodeproj/project.pbxproj b/ARCHBLOX.xcodeproj/project.pbxproj index e3125a2..e1e78b1 100644 --- a/ARCHBLOX.xcodeproj/project.pbxproj +++ b/ARCHBLOX.xcodeproj/project.pbxproj @@ -350,7 +350,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 12.3; + MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -404,7 +404,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 12.3; + MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = macosx; @@ -418,19 +418,23 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CODE_SIGN_ENTITLEMENTS = ARCHBLOX/ARCHBLOX.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_KEY_CFBundleDisplayName = ARCHBLOX; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.games"; INFOPLIST_KEY_NSHumanReadableCopyright = ""; INFOPLIST_KEY_NSMainStoryboardFile = Main; INFOPLIST_KEY_NSPrincipalClass = NSApplication; + INFOPLIST_KEY_UILaunchStoryboardName = Main.storyboard; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.10; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.ARCHBLOX.ARCHBLOX; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -444,19 +448,23 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CODE_SIGN_ENTITLEMENTS = ARCHBLOX/ARCHBLOX.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_KEY_CFBundleDisplayName = ARCHBLOX; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.games"; INFOPLIST_KEY_NSHumanReadableCopyright = ""; INFOPLIST_KEY_NSMainStoryboardFile = Main; INFOPLIST_KEY_NSPrincipalClass = NSApplication; + INFOPLIST_KEY_UILaunchStoryboardName = Main.storyboard; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.10; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.ARCHBLOX.ARCHBLOX; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -473,7 +481,7 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; - MACOSX_DEPLOYMENT_TARGET = 12.3; + MACOSX_DEPLOYMENT_TARGET = 10.10; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.ARCHBLOX.ARCHBLOXTests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -491,7 +499,7 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; - MACOSX_DEPLOYMENT_TARGET = 12.3; + MACOSX_DEPLOYMENT_TARGET = 10.10; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.ARCHBLOX.ARCHBLOXTests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -508,6 +516,7 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.10; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.ARCHBLOX.ARCHBLOXUITests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -524,6 +533,7 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.10; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.ARCHBLOX.ARCHBLOXUITests; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 1.png b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 1.png new file mode 100644 index 0000000..ad68e6e Binary files /dev/null and b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 1.png differ diff --git a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 2.png b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 2.png new file mode 100644 index 0000000..fb31327 Binary files /dev/null and b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 2.png differ diff --git a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 3.png b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 3.png new file mode 100644 index 0000000..fb31327 Binary files /dev/null and b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 3.png differ diff --git a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 4.png b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 4.png new file mode 100644 index 0000000..ad68e6e Binary files /dev/null and b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 4.png differ diff --git a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 5.png b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 5.png new file mode 100644 index 0000000..2279679 Binary files /dev/null and b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 5.png differ diff --git a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 6.png b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 6.png new file mode 100644 index 0000000..2279679 Binary files /dev/null and b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 6.png differ diff --git a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 7.png b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 7.png new file mode 100644 index 0000000..44be55a Binary files /dev/null and b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 7.png differ diff --git a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 8.png b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 8.png new file mode 100644 index 0000000..a4d1eb6 Binary files /dev/null and b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 8.png differ diff --git a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 9.png b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 9.png new file mode 100644 index 0000000..759acc3 Binary files /dev/null and b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 9.png differ diff --git a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX.png b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX.png new file mode 100644 index 0000000..45a5056 Binary files /dev/null and b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX.png differ diff --git a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/Contents.json b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/Contents.json index 3f00db4..f09c422 100644 --- a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,51 +1,61 @@ { "images" : [ { + "filename" : "ARCHBLOX.png", "idiom" : "mac", "scale" : "1x", "size" : "16x16" }, { + "filename" : "ARCHBLOX 2.png", "idiom" : "mac", "scale" : "2x", "size" : "16x16" }, { + "filename" : "ARCHBLOX 3.png", "idiom" : "mac", "scale" : "1x", "size" : "32x32" }, { + "filename" : "ARCHBLOX 8.png", "idiom" : "mac", "scale" : "2x", "size" : "32x32" }, { + "filename" : "ARCHBLOX 7.png", "idiom" : "mac", "scale" : "1x", "size" : "128x128" }, { + "filename" : "ARCHBLOX 5.png", "idiom" : "mac", "scale" : "2x", "size" : "128x128" }, { + "filename" : "ARCHBLOX 6.png", "idiom" : "mac", "scale" : "1x", "size" : "256x256" }, { + "filename" : "ARCHBLOX 4.png", "idiom" : "mac", "scale" : "2x", "size" : "256x256" }, { + "filename" : "ARCHBLOX 1.png", "idiom" : "mac", "scale" : "1x", "size" : "512x512" }, { + "filename" : "ARCHBLOX 9.png", "idiom" : "mac", "scale" : "2x", "size" : "512x512" diff --git a/ARCHBLOX/Base.lproj/Main.storyboard b/ARCHBLOX/Base.lproj/Main.storyboard index 182da99..ade8d30 100644 --- a/ARCHBLOX/Base.lproj/Main.storyboard +++ b/ARCHBLOX/Base.lproj/Main.storyboard @@ -23,13 +23,6 @@ - - - - - - - @@ -97,7 +90,7 @@ - +