diff --git a/DevourAndDrought/DevourAndDrought.xcodeproj/project.pbxproj b/DevourAndDrought/DevourAndDrought.xcodeproj/project.pbxproj index 53a1765..c202cdd 100644 --- a/DevourAndDrought/DevourAndDrought.xcodeproj/project.pbxproj +++ b/DevourAndDrought/DevourAndDrought.xcodeproj/project.pbxproj @@ -446,7 +446,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = PRBH2T6668; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = DevourAndDrought/Info.plist; @@ -462,7 +462,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0; + MARKETING_VERSION = 1.1; PRODUCT_BUNDLE_IDENTIFIER = com.mpg13.faf; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = YES; @@ -477,7 +477,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = PRBH2T6668; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = DevourAndDrought/Info.plist; @@ -493,7 +493,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0; + MARKETING_VERSION = 1.1; PRODUCT_BUNDLE_IDENTIFIER = com.mpg13.faf; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = YES; diff --git a/DevourAndDrought/DevourAndDrought.xcodeproj/project.xcworkspace/xcuserdata/penelopegomez.xcuserdatad/UserInterfaceState.xcuserstate b/DevourAndDrought/DevourAndDrought.xcodeproj/project.xcworkspace/xcuserdata/penelopegomez.xcuserdatad/UserInterfaceState.xcuserstate index 4421801..c632921 100644 Binary files a/DevourAndDrought/DevourAndDrought.xcodeproj/project.xcworkspace/xcuserdata/penelopegomez.xcuserdatad/UserInterfaceState.xcuserstate and b/DevourAndDrought/DevourAndDrought.xcodeproj/project.xcworkspace/xcuserdata/penelopegomez.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/DevourAndDrought/DevourAndDrought/Assets.xcassets/Micah Gomez.imageset/coollogo_com-13092940.png b/DevourAndDrought/DevourAndDrought/Assets.xcassets/Micah Gomez.imageset/coollogo_com-13092940.png deleted file mode 100644 index fbf874b..0000000 Binary files a/DevourAndDrought/DevourAndDrought/Assets.xcassets/Micah Gomez.imageset/coollogo_com-13092940.png and /dev/null differ diff --git a/DevourAndDrought/DevourAndDrought/Assets.xcassets/Micah Gomez.imageset/coollogo_com-13092941.png b/DevourAndDrought/DevourAndDrought/Assets.xcassets/Micah Gomez.imageset/coollogo_com-13092941.png deleted file mode 100644 index fbf874b..0000000 Binary files a/DevourAndDrought/DevourAndDrought/Assets.xcassets/Micah Gomez.imageset/coollogo_com-13092941.png and /dev/null differ diff --git a/DevourAndDrought/DevourAndDrought/Assets.xcassets/Micah Gomez.imageset/coollogo_com-13092942.png b/DevourAndDrought/DevourAndDrought/Assets.xcassets/Micah Gomez.imageset/coollogo_com-13092942.png deleted file mode 100644 index fbf874b..0000000 Binary files a/DevourAndDrought/DevourAndDrought/Assets.xcassets/Micah Gomez.imageset/coollogo_com-13092942.png and /dev/null differ diff --git a/DevourAndDrought/DevourAndDrought/Assets.xcassets/Micah Gomez.imageset/Contents.json b/DevourAndDrought/DevourAndDrought/Assets.xcassets/Penelope Gomez.imageset/Contents.json similarity index 65% rename from DevourAndDrought/DevourAndDrought/Assets.xcassets/Micah Gomez.imageset/Contents.json rename to DevourAndDrought/DevourAndDrought/Assets.xcassets/Penelope Gomez.imageset/Contents.json index 7d2bff1..8ccde57 100644 --- a/DevourAndDrought/DevourAndDrought/Assets.xcassets/Micah Gomez.imageset/Contents.json +++ b/DevourAndDrought/DevourAndDrought/Assets.xcassets/Penelope Gomez.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "coollogo_com-13092940.png", + "filename" : "PenelopeGomez.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "coollogo_com-13092941.png", + "filename" : "PenelopeGomez-1.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "coollogo_com-13092942.png", + "filename" : "PenelopeGomez-2.png", "idiom" : "universal", "scale" : "3x" } diff --git a/DevourAndDrought/DevourAndDrought/Assets.xcassets/Penelope Gomez.imageset/PenelopeGomez-1.png b/DevourAndDrought/DevourAndDrought/Assets.xcassets/Penelope Gomez.imageset/PenelopeGomez-1.png new file mode 100644 index 0000000..8886f3d Binary files /dev/null and b/DevourAndDrought/DevourAndDrought/Assets.xcassets/Penelope Gomez.imageset/PenelopeGomez-1.png differ diff --git a/DevourAndDrought/DevourAndDrought/Assets.xcassets/Penelope Gomez.imageset/PenelopeGomez-2.png b/DevourAndDrought/DevourAndDrought/Assets.xcassets/Penelope Gomez.imageset/PenelopeGomez-2.png new file mode 100644 index 0000000..8886f3d Binary files /dev/null and b/DevourAndDrought/DevourAndDrought/Assets.xcassets/Penelope Gomez.imageset/PenelopeGomez-2.png differ diff --git a/DevourAndDrought/DevourAndDrought/Assets.xcassets/Penelope Gomez.imageset/PenelopeGomez.png b/DevourAndDrought/DevourAndDrought/Assets.xcassets/Penelope Gomez.imageset/PenelopeGomez.png new file mode 100644 index 0000000..8886f3d Binary files /dev/null and b/DevourAndDrought/DevourAndDrought/Assets.xcassets/Penelope Gomez.imageset/PenelopeGomez.png differ diff --git a/DevourAndDrought/DevourAndDrought/Assets.xcassets/gold_bg.imageset/Contents.json b/DevourAndDrought/DevourAndDrought/Assets.xcassets/gold_bg.imageset/Contents.json new file mode 100644 index 0000000..1863e48 --- /dev/null +++ b/DevourAndDrought/DevourAndDrought/Assets.xcassets/gold_bg.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "texture_71___gold_by_wanderingsoul_stox-overlay.jpg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "texture_71___gold_by_wanderingsoul_stox-overlay-1.jpg", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "texture_71___gold_by_wanderingsoul_stox-overlay-2.jpg", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/DevourAndDrought/DevourAndDrought/Assets.xcassets/gold_bg.imageset/texture_71___gold_by_wanderingsoul_stox-overlay-1.jpg b/DevourAndDrought/DevourAndDrought/Assets.xcassets/gold_bg.imageset/texture_71___gold_by_wanderingsoul_stox-overlay-1.jpg new file mode 100644 index 0000000..59387aa Binary files /dev/null and b/DevourAndDrought/DevourAndDrought/Assets.xcassets/gold_bg.imageset/texture_71___gold_by_wanderingsoul_stox-overlay-1.jpg differ diff --git a/DevourAndDrought/DevourAndDrought/Assets.xcassets/gold_bg.imageset/texture_71___gold_by_wanderingsoul_stox-overlay-2.jpg b/DevourAndDrought/DevourAndDrought/Assets.xcassets/gold_bg.imageset/texture_71___gold_by_wanderingsoul_stox-overlay-2.jpg new file mode 100644 index 0000000..59387aa Binary files /dev/null and b/DevourAndDrought/DevourAndDrought/Assets.xcassets/gold_bg.imageset/texture_71___gold_by_wanderingsoul_stox-overlay-2.jpg differ diff --git a/DevourAndDrought/DevourAndDrought/Assets.xcassets/gold_bg.imageset/texture_71___gold_by_wanderingsoul_stox-overlay.jpg b/DevourAndDrought/DevourAndDrought/Assets.xcassets/gold_bg.imageset/texture_71___gold_by_wanderingsoul_stox-overlay.jpg new file mode 100644 index 0000000..59387aa Binary files /dev/null and b/DevourAndDrought/DevourAndDrought/Assets.xcassets/gold_bg.imageset/texture_71___gold_by_wanderingsoul_stox-overlay.jpg differ diff --git a/DevourAndDrought/DevourAndDrought/Assets.xcassets/gold_lbg.imageset/Contents.json b/DevourAndDrought/DevourAndDrought/Assets.xcassets/gold_lbg.imageset/Contents.json new file mode 100644 index 0000000..ddf469e --- /dev/null +++ b/DevourAndDrought/DevourAndDrought/Assets.xcassets/gold_lbg.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "texture_71___gold_by_wanderingsoul_stox.jpg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/DevourAndDrought/DevourAndDrought/Assets.xcassets/gold_lbg.imageset/texture_71___gold_by_wanderingsoul_stox.jpg b/DevourAndDrought/DevourAndDrought/Assets.xcassets/gold_lbg.imageset/texture_71___gold_by_wanderingsoul_stox.jpg new file mode 100644 index 0000000..ff47793 Binary files /dev/null and b/DevourAndDrought/DevourAndDrought/Assets.xcassets/gold_lbg.imageset/texture_71___gold_by_wanderingsoul_stox.jpg differ diff --git a/DevourAndDrought/DevourAndDrought/Assets.xcassets/sand_bg.imageset/Contents.json b/DevourAndDrought/DevourAndDrought/Assets.xcassets/sand_bg.imageset/Contents.json new file mode 100644 index 0000000..9e25bb4 --- /dev/null +++ b/DevourAndDrought/DevourAndDrought/Assets.xcassets/sand_bg.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "photos_2017_7_14_fst_sand-texture-ripple.jpg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "photos_2017_7_14_fst_sand-texture-ripple-1.jpg", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "photos_2017_7_14_fst_sand-texture-ripple-2.jpg", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/DevourAndDrought/DevourAndDrought/Assets.xcassets/sand_bg.imageset/photos_2017_7_14_fst_sand-texture-ripple-1.jpg b/DevourAndDrought/DevourAndDrought/Assets.xcassets/sand_bg.imageset/photos_2017_7_14_fst_sand-texture-ripple-1.jpg new file mode 100644 index 0000000..dd0bd12 Binary files /dev/null and b/DevourAndDrought/DevourAndDrought/Assets.xcassets/sand_bg.imageset/photos_2017_7_14_fst_sand-texture-ripple-1.jpg differ diff --git a/DevourAndDrought/DevourAndDrought/Assets.xcassets/sand_bg.imageset/photos_2017_7_14_fst_sand-texture-ripple-2.jpg b/DevourAndDrought/DevourAndDrought/Assets.xcassets/sand_bg.imageset/photos_2017_7_14_fst_sand-texture-ripple-2.jpg new file mode 100644 index 0000000..dd0bd12 Binary files /dev/null and b/DevourAndDrought/DevourAndDrought/Assets.xcassets/sand_bg.imageset/photos_2017_7_14_fst_sand-texture-ripple-2.jpg differ diff --git a/DevourAndDrought/DevourAndDrought/Assets.xcassets/sand_bg.imageset/photos_2017_7_14_fst_sand-texture-ripple.jpg b/DevourAndDrought/DevourAndDrought/Assets.xcassets/sand_bg.imageset/photos_2017_7_14_fst_sand-texture-ripple.jpg new file mode 100644 index 0000000..dd0bd12 Binary files /dev/null and b/DevourAndDrought/DevourAndDrought/Assets.xcassets/sand_bg.imageset/photos_2017_7_14_fst_sand-texture-ripple.jpg differ diff --git a/DevourAndDrought/DevourAndDrought/Base.lproj/LaunchScreen.storyboard b/DevourAndDrought/DevourAndDrought/Base.lproj/LaunchScreen.storyboard index 13e88aa..921ba71 100644 --- a/DevourAndDrought/DevourAndDrought/Base.lproj/LaunchScreen.storyboard +++ b/DevourAndDrought/DevourAndDrought/Base.lproj/LaunchScreen.storyboard @@ -1,9 +1,9 @@ - + - + @@ -23,7 +23,7 @@ - +