Merge branch '5-view-basis' into 'development'
Resolve "[View] Basis" Closes #5 See merge request marcel.schwarz/software-projekt-2!4
This commit is contained in:
commit
c1638f78fa
@ -0,0 +1,6 @@
|
||||
{
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
BIN
GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerOne.imageset/Blue-large.png
vendored
Normal file
BIN
GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerOne.imageset/Blue-large.png
vendored
Normal file
Binary file not shown.
After Width: | Height: | Size: 53 KiB |
BIN
GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerOne.imageset/Blue-medium.png
vendored
Normal file
BIN
GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerOne.imageset/Blue-medium.png
vendored
Normal file
Binary file not shown.
After Width: | Height: | Size: 34 KiB |
BIN
GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerOne.imageset/Blue-small.png
vendored
Normal file
BIN
GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerOne.imageset/Blue-small.png
vendored
Normal file
Binary file not shown.
After Width: | Height: | Size: 16 KiB |
23
GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerOne.imageset/Contents.json
vendored
Normal file
23
GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerOne.imageset/Contents.json
vendored
Normal file
@ -0,0 +1,23 @@
|
||||
{
|
||||
"images" : [
|
||||
{
|
||||
"filename" : "Blue-small.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"filename" : "Blue-medium.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"filename" : "Blue-large.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
23
GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerTwo.imageset/Contents.json
vendored
Normal file
23
GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerTwo.imageset/Contents.json
vendored
Normal file
@ -0,0 +1,23 @@
|
||||
{
|
||||
"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
|
||||
}
|
||||
}
|
BIN
GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerTwo.imageset/Red-large.png
vendored
Normal file
BIN
GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerTwo.imageset/Red-large.png
vendored
Normal file
Binary file not shown.
After Width: | Height: | Size: 54 KiB |
BIN
GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerTwo.imageset/Red-medium.png
vendored
Normal file
BIN
GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerTwo.imageset/Red-medium.png
vendored
Normal file
Binary file not shown.
After Width: | Height: | Size: 29 KiB |
BIN
GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerTwo.imageset/Red-small.png
vendored
Normal file
BIN
GoldWars/GoldWars/Assets.xcassets/BaseTexture/PlayerTwo.imageset/Red-small.png
vendored
Normal file
Binary file not shown.
After Width: | Height: | Size: 9.6 KiB |
Loading…
Reference in New Issue
Block a user