diff --git a/GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerOne.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/Base.imageset/Contents.json similarity index 70% rename from GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerOne.imageset/Contents.json rename to GoldWars/GoldWars/Assets.xcassets/Base.imageset/Contents.json index 90f6141..91f9bef 100644 --- a/GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerOne.imageset/Contents.json +++ b/GoldWars/GoldWars/Assets.xcassets/Base.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "Blue-small.png", + "filename" : "base-small.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "Blue-medium.png", + "filename" : "base-medium.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Blue-large.png", + "filename" : "base-large.png", "idiom" : "universal", "scale" : "3x" } diff --git a/GoldWars/GoldWars/Assets.xcassets/Base.imageset/base-large.png b/GoldWars/GoldWars/Assets.xcassets/Base.imageset/base-large.png new file mode 100644 index 0000000..b3b9ec4 Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/Base.imageset/base-large.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/Base.imageset/base-medium.png b/GoldWars/GoldWars/Assets.xcassets/Base.imageset/base-medium.png new file mode 100644 index 0000000..99710a1 Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/Base.imageset/base-medium.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/Base.imageset/base-small.png b/GoldWars/GoldWars/Assets.xcassets/Base.imageset/base-small.png new file mode 100644 index 0000000..dd7d356 Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/Base.imageset/base-small.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/BaseTexture/Contents.json b/GoldWars/GoldWars/Assets.xcassets/BaseTexture/Contents.json deleted file mode 100644 index 73c0059..0000000 --- a/GoldWars/GoldWars/Assets.xcassets/BaseTexture/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerOne.imageset/Blue-large.png b/GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerOne.imageset/Blue-large.png deleted file mode 100644 index 36c39f3..0000000 Binary files a/GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerOne.imageset/Blue-large.png and /dev/null differ diff --git a/GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerOne.imageset/Blue-medium.png b/GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerOne.imageset/Blue-medium.png deleted file mode 100644 index d46a821..0000000 Binary files a/GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerOne.imageset/Blue-medium.png and /dev/null differ diff --git a/GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerOne.imageset/Blue-small.png b/GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerOne.imageset/Blue-small.png deleted file mode 100644 index 4138b79..0000000 Binary files a/GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerOne.imageset/Blue-small.png and /dev/null differ diff --git a/GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerTwo.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerTwo.imageset/Contents.json deleted file mode 100644 index 3fda81f..0000000 --- a/GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerTwo.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "Red-small.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Red-medium.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Red-large.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerTwo.imageset/Red-large.png b/GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerTwo.imageset/Red-large.png deleted file mode 100644 index 61b4e99..0000000 Binary files a/GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerTwo.imageset/Red-large.png and /dev/null differ diff --git a/GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerTwo.imageset/Red-medium.png b/GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerTwo.imageset/Red-medium.png deleted file mode 100644 index ca641a8..0000000 Binary files a/GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerTwo.imageset/Red-medium.png and /dev/null differ diff --git a/GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerTwo.imageset/Red-small.png b/GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerTwo.imageset/Red-small.png deleted file mode 100644 index 68d96fc..0000000 Binary files a/GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerTwo.imageset/Red-small.png and /dev/null differ