diff --git a/Privyet.xcodeproj/project.pbxproj b/Privyet.xcodeproj/project.pbxproj index 109cfc8..cf7e28a 100644 --- a/Privyet.xcodeproj/project.pbxproj +++ b/Privyet.xcodeproj/project.pbxproj @@ -13,7 +13,6 @@ E1EB2FBA247A33F200AA6A24 /* GameViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1EB2FB9247A33F200AA6A24 /* GameViewController.swift */; }; E1EB2FBD247A33F200AA6A24 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E1EB2FBB247A33F200AA6A24 /* Main.storyboard */; }; E1EB2FBF247A340600AA6A24 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E1EB2FBE247A340600AA6A24 /* Assets.xcassets */; }; - E1EB2FC2247A340600AA6A24 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E1EB2FC0247A340600AA6A24 /* LaunchScreen.storyboard */; }; E1EB2FCD247A340700AA6A24 /* PrivyetTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1EB2FCC247A340700AA6A24 /* PrivyetTests.swift */; }; E1EB2FD8247A340700AA6A24 /* PrivyetUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1EB2FD7247A340700AA6A24 /* PrivyetUITests.swift */; }; E1EB2FE6247A37EB00AA6A24 /* Sounds in Resources */ = {isa = PBXBuildFile; fileRef = E1EB2FE5247A37EB00AA6A24 /* Sounds */; }; @@ -29,6 +28,7 @@ E1EB2FFB247A5E4200AA6A24 /* ZShape.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1EB2FFA247A5E4200AA6A24 /* ZShape.swift */; }; E1EB2FFD247AF6ED00AA6A24 /* Privyet.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1EB2FFC247AF6ED00AA6A24 /* Privyet.swift */; }; E1EB2FFE247B2FFA00AA6A24 /* Sprites.atlas in Resources */ = {isa = PBXBuildFile; fileRef = E1EB2FE7247A380100AA6A24 /* Sprites.atlas */; }; + E1EB3001247E480300AA6A24 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E1EB2FFF247E480300AA6A24 /* LaunchScreen.storyboard */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -56,7 +56,6 @@ E1EB2FB9247A33F200AA6A24 /* GameViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameViewController.swift; sourceTree = ""; }; E1EB2FBC247A33F200AA6A24 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; E1EB2FBE247A340600AA6A24 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - E1EB2FC1247A340600AA6A24 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; E1EB2FC3247A340600AA6A24 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; E1EB2FC8247A340700AA6A24 /* PrivyetTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PrivyetTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; E1EB2FCC247A340700AA6A24 /* PrivyetTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrivyetTests.swift; sourceTree = ""; }; @@ -77,6 +76,7 @@ E1EB2FF8247A5C8200AA6A24 /* SShape.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SShape.swift; sourceTree = ""; }; E1EB2FFA247A5E4200AA6A24 /* ZShape.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZShape.swift; sourceTree = ""; }; E1EB2FFC247AF6ED00AA6A24 /* Privyet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Privyet.swift; sourceTree = ""; }; + E1EB3000247E480300AA6A24 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -127,6 +127,7 @@ E1EB2FB0247A33F200AA6A24 /* Privyet */ = { isa = PBXGroup; children = ( + E1EB2FFF247E480300AA6A24 /* LaunchScreen.storyboard */, E1EB2FB1247A33F200AA6A24 /* AppDelegate.swift */, E1EB2FB5247A33F200AA6A24 /* Actions.sks */, E1EB2FB7247A33F200AA6A24 /* GameScene.swift */, @@ -135,7 +136,6 @@ E1EB2FE5247A37EB00AA6A24 /* Sounds */, E1EB2FBB247A33F200AA6A24 /* Main.storyboard */, E1EB2FBE247A340600AA6A24 /* Assets.xcassets */, - E1EB2FC0247A340600AA6A24 /* LaunchScreen.storyboard */, E1EB2FC3247A340600AA6A24 /* Info.plist */, E1EB2FE8247A3CB900AA6A24 /* Array2D.swift */, E1EB2FEA247A408800AA6A24 /* Block.swift */, @@ -277,8 +277,8 @@ E1EB2FFE247B2FFA00AA6A24 /* Sprites.atlas in Resources */, E1EB2FE6247A37EB00AA6A24 /* Sounds in Resources */, E1EB2FBD247A33F200AA6A24 /* Main.storyboard in Resources */, + E1EB3001247E480300AA6A24 /* LaunchScreen.storyboard in Resources */, E1EB2FBF247A340600AA6A24 /* Assets.xcassets in Resources */, - E1EB2FC2247A340600AA6A24 /* LaunchScreen.storyboard in Resources */, E1EB2FB6247A33F200AA6A24 /* Actions.sks in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -361,10 +361,10 @@ name = Main.storyboard; sourceTree = ""; }; - E1EB2FC0247A340600AA6A24 /* LaunchScreen.storyboard */ = { + E1EB2FFF247E480300AA6A24 /* LaunchScreen.storyboard */ = { isa = PBXVariantGroup; children = ( - E1EB2FC1247A340600AA6A24 /* Base */, + E1EB3000247E480300AA6A24 /* Base */, ); name = LaunchScreen.storyboard; sourceTree = ""; diff --git a/Privyet/Assets.xcassets/AppIcon.appiconset/Contents.json b/Privyet/Assets.xcassets/AppIcon.appiconset/Contents.json index cc04b5f..54ce2ef 100644 --- a/Privyet/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/Privyet/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -11,34 +11,37 @@ "size" : "20x20" }, { - "filename" : "icon-29pt.png", + "filename" : "privyet-icon-58sq.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { + "filename" : "privyet-icon-87sq.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { - "filename" : "icon-40pt.png", + "filename" : "privyet-icon-80sq.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { + "filename" : "privyet-icon-120sq-1.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { - "filename" : "icon-60pt.png", + "filename" : "privyet-icon-120sq.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "privyet-icon-180sq.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" @@ -89,6 +92,7 @@ "size" : "83.5x83.5" }, { + "filename" : "privyet-1024sq.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/Privyet/Assets.xcassets/AppIcon.appiconset/icon-29pt.png b/Privyet/Assets.xcassets/AppIcon.appiconset/icon-29pt.png deleted file mode 100644 index 35b81a9..0000000 Binary files a/Privyet/Assets.xcassets/AppIcon.appiconset/icon-29pt.png and /dev/null differ diff --git a/Privyet/Assets.xcassets/AppIcon.appiconset/icon-40pt.png b/Privyet/Assets.xcassets/AppIcon.appiconset/icon-40pt.png deleted file mode 100644 index 09f81cb..0000000 Binary files a/Privyet/Assets.xcassets/AppIcon.appiconset/icon-40pt.png and /dev/null differ diff --git a/Privyet/Assets.xcassets/AppIcon.appiconset/icon-60pt.png b/Privyet/Assets.xcassets/AppIcon.appiconset/icon-60pt.png deleted file mode 100644 index 96648ad..0000000 Binary files a/Privyet/Assets.xcassets/AppIcon.appiconset/icon-60pt.png and /dev/null differ diff --git a/Privyet/Assets.xcassets/AppIcon.appiconset/privyet-1024sq.png b/Privyet/Assets.xcassets/AppIcon.appiconset/privyet-1024sq.png new file mode 100644 index 0000000..a2b0594 Binary files /dev/null and b/Privyet/Assets.xcassets/AppIcon.appiconset/privyet-1024sq.png differ diff --git a/Privyet/Assets.xcassets/AppIcon.appiconset/privyet-icon-120sq-1.png b/Privyet/Assets.xcassets/AppIcon.appiconset/privyet-icon-120sq-1.png new file mode 100644 index 0000000..261d358 Binary files /dev/null and b/Privyet/Assets.xcassets/AppIcon.appiconset/privyet-icon-120sq-1.png differ diff --git a/Privyet/Assets.xcassets/AppIcon.appiconset/privyet-icon-120sq.png b/Privyet/Assets.xcassets/AppIcon.appiconset/privyet-icon-120sq.png new file mode 100644 index 0000000..261d358 Binary files /dev/null and b/Privyet/Assets.xcassets/AppIcon.appiconset/privyet-icon-120sq.png differ diff --git a/Privyet/Assets.xcassets/AppIcon.appiconset/privyet-icon-180sq.png b/Privyet/Assets.xcassets/AppIcon.appiconset/privyet-icon-180sq.png new file mode 100644 index 0000000..56007d5 Binary files /dev/null and b/Privyet/Assets.xcassets/AppIcon.appiconset/privyet-icon-180sq.png differ diff --git a/Privyet/Assets.xcassets/AppIcon.appiconset/privyet-icon-58sq.png b/Privyet/Assets.xcassets/AppIcon.appiconset/privyet-icon-58sq.png new file mode 100644 index 0000000..94d25b0 Binary files /dev/null and b/Privyet/Assets.xcassets/AppIcon.appiconset/privyet-icon-58sq.png differ diff --git a/Privyet/Assets.xcassets/AppIcon.appiconset/privyet-icon-80sq.png b/Privyet/Assets.xcassets/AppIcon.appiconset/privyet-icon-80sq.png new file mode 100644 index 0000000..4a1dff7 Binary files /dev/null and b/Privyet/Assets.xcassets/AppIcon.appiconset/privyet-icon-80sq.png differ diff --git a/Privyet/Assets.xcassets/AppIcon.appiconset/privyet-icon-87sq.png b/Privyet/Assets.xcassets/AppIcon.appiconset/privyet-icon-87sq.png new file mode 100644 index 0000000..b01d8ce Binary files /dev/null and b/Privyet/Assets.xcassets/AppIcon.appiconset/privyet-icon-87sq.png differ diff --git a/Privyet/Assets.xcassets/LaunchImage.launchimage/Contents.json b/Privyet/Assets.xcassets/LaunchImage.launchimage/Contents.json new file mode 100644 index 0000000..b1a4574 --- /dev/null +++ b/Privyet/Assets.xcassets/LaunchImage.launchimage/Contents.json @@ -0,0 +1,200 @@ +{ + "images" : [ + { + "extent" : "full-screen", + "filename" : "privyet-launch-2688.png", + "idiom" : "iphone", + "minimum-system-version" : "12.0", + "orientation" : "portrait", + "scale" : "3x", + "subtype" : "2688h" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "minimum-system-version" : "12.0", + "orientation" : "landscape", + "scale" : "3x", + "subtype" : "2688h" + }, + { + "extent" : "full-screen", + "filename" : "privyet-launch-1792.png", + "idiom" : "iphone", + "minimum-system-version" : "12.0", + "orientation" : "portrait", + "scale" : "2x", + "subtype" : "1792h" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "minimum-system-version" : "12.0", + "orientation" : "landscape", + "scale" : "2x", + "subtype" : "1792h" + }, + { + "extent" : "full-screen", + "filename" : "privyet-launch-2436.png", + "idiom" : "iphone", + "minimum-system-version" : "11.0", + "orientation" : "portrait", + "scale" : "3x", + "subtype" : "2436h" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "minimum-system-version" : "11.0", + "orientation" : "landscape", + "scale" : "3x", + "subtype" : "2436h" + }, + { + "extent" : "full-screen", + "filename" : "privyet-launch-2208.png", + "idiom" : "iphone", + "minimum-system-version" : "8.0", + "orientation" : "portrait", + "scale" : "3x", + "subtype" : "736h" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "minimum-system-version" : "8.0", + "orientation" : "landscape", + "scale" : "3x", + "subtype" : "736h" + }, + { + "extent" : "full-screen", + "filename" : "privyet-launch-1334.png", + "idiom" : "iphone", + "minimum-system-version" : "8.0", + "orientation" : "portrait", + "scale" : "2x", + "subtype" : "667h" + }, + { + "extent" : "full-screen", + "filename" : "privyet-launch-960.png", + "idiom" : "iphone", + "minimum-system-version" : "7.0", + "orientation" : "portrait", + "scale" : "2x" + }, + { + "extent" : "full-screen", + "filename" : "privyet-launch-1136.png", + "idiom" : "iphone", + "minimum-system-version" : "7.0", + "orientation" : "portrait", + "scale" : "2x", + "subtype" : "retina4" + }, + { + "extent" : "full-screen", + "idiom" : "ipad", + "minimum-system-version" : "7.0", + "orientation" : "portrait", + "scale" : "1x" + }, + { + "extent" : "full-screen", + "idiom" : "ipad", + "minimum-system-version" : "7.0", + "orientation" : "landscape", + "scale" : "1x" + }, + { + "extent" : "full-screen", + "idiom" : "ipad", + "minimum-system-version" : "7.0", + "orientation" : "portrait", + "scale" : "2x" + }, + { + "extent" : "full-screen", + "idiom" : "ipad", + "minimum-system-version" : "7.0", + "orientation" : "landscape", + "scale" : "2x" + }, + { + "extent" : "full-screen", + "filename" : "privyet-launch-480.png", + "idiom" : "iphone", + "orientation" : "portrait", + "scale" : "1x" + }, + { + "extent" : "full-screen", + "filename" : "privyet-launch-961.png", + "idiom" : "iphone", + "orientation" : "portrait", + "scale" : "2x" + }, + { + "extent" : "full-screen", + "filename" : "privyet-launch-1137.png", + "idiom" : "iphone", + "orientation" : "portrait", + "scale" : "2x", + "subtype" : "retina4" + }, + { + "extent" : "to-status-bar", + "idiom" : "ipad", + "orientation" : "portrait", + "scale" : "1x" + }, + { + "extent" : "full-screen", + "idiom" : "ipad", + "orientation" : "portrait", + "scale" : "1x" + }, + { + "extent" : "to-status-bar", + "idiom" : "ipad", + "orientation" : "landscape", + "scale" : "1x" + }, + { + "extent" : "full-screen", + "idiom" : "ipad", + "orientation" : "landscape", + "scale" : "1x" + }, + { + "extent" : "to-status-bar", + "idiom" : "ipad", + "orientation" : "portrait", + "scale" : "2x" + }, + { + "extent" : "full-screen", + "idiom" : "ipad", + "orientation" : "portrait", + "scale" : "2x" + }, + { + "extent" : "to-status-bar", + "idiom" : "ipad", + "orientation" : "landscape", + "scale" : "2x" + }, + { + "extent" : "full-screen", + "idiom" : "ipad", + "orientation" : "landscape", + "scale" : "2x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Privyet/Assets.xcassets/LaunchImage.launchimage/privyet-launch-1136.png b/Privyet/Assets.xcassets/LaunchImage.launchimage/privyet-launch-1136.png new file mode 100644 index 0000000..bbf0a2a Binary files /dev/null and b/Privyet/Assets.xcassets/LaunchImage.launchimage/privyet-launch-1136.png differ diff --git a/Privyet/Assets.xcassets/LaunchImage.launchimage/privyet-launch-1137.png b/Privyet/Assets.xcassets/LaunchImage.launchimage/privyet-launch-1137.png new file mode 100644 index 0000000..bbf0a2a Binary files /dev/null and b/Privyet/Assets.xcassets/LaunchImage.launchimage/privyet-launch-1137.png differ diff --git a/Privyet/Assets.xcassets/LaunchImage.launchimage/privyet-launch-1334.png b/Privyet/Assets.xcassets/LaunchImage.launchimage/privyet-launch-1334.png new file mode 100644 index 0000000..217bb60 Binary files /dev/null and b/Privyet/Assets.xcassets/LaunchImage.launchimage/privyet-launch-1334.png differ diff --git a/Privyet/Assets.xcassets/LaunchImage.launchimage/privyet-launch-1792.png b/Privyet/Assets.xcassets/LaunchImage.launchimage/privyet-launch-1792.png new file mode 100644 index 0000000..1240227 Binary files /dev/null and b/Privyet/Assets.xcassets/LaunchImage.launchimage/privyet-launch-1792.png differ diff --git a/Privyet/Assets.xcassets/LaunchImage.launchimage/privyet-launch-2208.png b/Privyet/Assets.xcassets/LaunchImage.launchimage/privyet-launch-2208.png new file mode 100644 index 0000000..d1cc42e Binary files /dev/null and b/Privyet/Assets.xcassets/LaunchImage.launchimage/privyet-launch-2208.png differ diff --git a/Privyet/Assets.xcassets/LaunchImage.launchimage/privyet-launch-2436.png b/Privyet/Assets.xcassets/LaunchImage.launchimage/privyet-launch-2436.png new file mode 100644 index 0000000..6bdc249 Binary files /dev/null and b/Privyet/Assets.xcassets/LaunchImage.launchimage/privyet-launch-2436.png differ diff --git a/Privyet/Assets.xcassets/LaunchImage.launchimage/privyet-launch-2688.png b/Privyet/Assets.xcassets/LaunchImage.launchimage/privyet-launch-2688.png new file mode 100644 index 0000000..baae32c Binary files /dev/null and b/Privyet/Assets.xcassets/LaunchImage.launchimage/privyet-launch-2688.png differ diff --git a/Privyet/Assets.xcassets/LaunchImage.launchimage/privyet-launch-480.png b/Privyet/Assets.xcassets/LaunchImage.launchimage/privyet-launch-480.png new file mode 100644 index 0000000..4ded83b Binary files /dev/null and b/Privyet/Assets.xcassets/LaunchImage.launchimage/privyet-launch-480.png differ diff --git a/Privyet/Assets.xcassets/LaunchImage.launchimage/privyet-launch-960.png b/Privyet/Assets.xcassets/LaunchImage.launchimage/privyet-launch-960.png new file mode 100644 index 0000000..c046c37 Binary files /dev/null and b/Privyet/Assets.xcassets/LaunchImage.launchimage/privyet-launch-960.png differ diff --git a/Privyet/Assets.xcassets/LaunchImage.launchimage/privyet-launch-961.png b/Privyet/Assets.xcassets/LaunchImage.launchimage/privyet-launch-961.png new file mode 100644 index 0000000..c046c37 Binary files /dev/null and b/Privyet/Assets.xcassets/LaunchImage.launchimage/privyet-launch-961.png differ diff --git a/Privyet/Base.lproj/LaunchScreen.storyboard b/Privyet/Base.lproj/LaunchScreen.storyboard index c9426ba..124e445 100644 --- a/Privyet/Base.lproj/LaunchScreen.storyboard +++ b/Privyet/Base.lproj/LaunchScreen.storyboard @@ -1,6 +1,6 @@ - + @@ -20,7 +20,7 @@ - + diff --git a/Privyet/Base.lproj/Main.storyboard b/Privyet/Base.lproj/Main.storyboard index baf538e..744732f 100644 --- a/Privyet/Base.lproj/Main.storyboard +++ b/Privyet/Base.lproj/Main.storyboard @@ -11,7 +11,7 @@ - + @@ -23,16 +23,16 @@ -