From bd529a04782627e8720743d6d898bef232752f18 Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Fri, 8 Jun 2018 12:37:34 +0200 Subject: [PATCH] Fix texture case sensitivity issues. --- .travis.yml | 2 ++ Resources/Prototypes/Entities/Items.yml | 8 ++++---- .../{textures => Textures}/Clothing/armorvest.png | Bin .../{textures => Textures}/Clothing/backpack.png | Bin .../Clothing/belt_utility.png | Bin .../Clothing/ears_headset.png | Bin .../{textures => Textures}/Clothing/gasmask.png | Bin .../Clothing/glasses_meson.png | Bin .../Clothing/gloves_yellow.png | Bin .../{textures => Textures}/Clothing/helmet_sec.png | Bin .../Clothing/idcard_standard.png | Bin Resources/{textures => Textures}/Mob/observer.png | Bin Resources/{textures => Textures}/Objects/gun.png | Bin Resources/{textures => Textures}/Objects/laser.png | Bin .../Objects/projectilebullet.png | Bin .../Objects/projectileweapon.png | Bin 16 files changed, 6 insertions(+), 4 deletions(-) rename Resources/{textures => Textures}/Clothing/armorvest.png (100%) rename Resources/{textures => Textures}/Clothing/backpack.png (100%) rename Resources/{textures => Textures}/Clothing/belt_utility.png (100%) rename Resources/{textures => Textures}/Clothing/ears_headset.png (100%) rename Resources/{textures => Textures}/Clothing/gasmask.png (100%) rename Resources/{textures => Textures}/Clothing/glasses_meson.png (100%) rename Resources/{textures => Textures}/Clothing/gloves_yellow.png (100%) rename Resources/{textures => Textures}/Clothing/helmet_sec.png (100%) rename Resources/{textures => Textures}/Clothing/idcard_standard.png (100%) rename Resources/{textures => Textures}/Mob/observer.png (100%) rename Resources/{textures => Textures}/Objects/gun.png (100%) rename Resources/{textures => Textures}/Objects/laser.png (100%) rename Resources/{textures => Textures}/Objects/projectilebullet.png (100%) rename Resources/{textures => Textures}/Objects/projectileweapon.png (100%) diff --git a/.travis.yml b/.travis.yml index f2ebb3518e..687bb0df19 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,6 +32,8 @@ before_script: - "engine/Tools/download_godotsharp.py" script: + # Prevent people from putting in textures/ (lowercase). +- "if [ -d "Resources/textures" ]; exit 1; fi" - "msbuild /p:Configuration=Debug /p:Platform=x64 /p:HEADLESS=1 /p:Configuratio=Debug /nologo /m /p:AllowMissingMacNatives=yes SpaceStation14Content.sln /p:Python=python3.6" diff --git a/Resources/Prototypes/Entities/Items.yml b/Resources/Prototypes/Entities/Items.yml index 57a9abd15c..fd2366d16f 100644 --- a/Resources/Prototypes/Entities/Items.yml +++ b/Resources/Prototypes/Entities/Items.yml @@ -34,9 +34,9 @@ description: A blue box, not the kind you're thinking of components: - type: Sprite - texture: Items/toolbox_b.png + texture: Items/Toolbox_b.png - type: Icon - texture: Items/toolbox_b.png + texture: Items/Toolbox_b.png - type: Storage Capacity: 60 - type: Item @@ -49,9 +49,9 @@ description: A toolbox typically stocked with electrical gear components: - type: Sprite - texture: Items/toolbox_y.png + texture: Items/Toolbox_y.png - type: Icon - texture: Items/toolbox_y.png + texture: Items/Toolbox_y.png - type: Storage Capacity: 60 - type: Item diff --git a/Resources/textures/Clothing/armorvest.png b/Resources/Textures/Clothing/armorvest.png similarity index 100% rename from Resources/textures/Clothing/armorvest.png rename to Resources/Textures/Clothing/armorvest.png diff --git a/Resources/textures/Clothing/backpack.png b/Resources/Textures/Clothing/backpack.png similarity index 100% rename from Resources/textures/Clothing/backpack.png rename to Resources/Textures/Clothing/backpack.png diff --git a/Resources/textures/Clothing/belt_utility.png b/Resources/Textures/Clothing/belt_utility.png similarity index 100% rename from Resources/textures/Clothing/belt_utility.png rename to Resources/Textures/Clothing/belt_utility.png diff --git a/Resources/textures/Clothing/ears_headset.png b/Resources/Textures/Clothing/ears_headset.png similarity index 100% rename from Resources/textures/Clothing/ears_headset.png rename to Resources/Textures/Clothing/ears_headset.png diff --git a/Resources/textures/Clothing/gasmask.png b/Resources/Textures/Clothing/gasmask.png similarity index 100% rename from Resources/textures/Clothing/gasmask.png rename to Resources/Textures/Clothing/gasmask.png diff --git a/Resources/textures/Clothing/glasses_meson.png b/Resources/Textures/Clothing/glasses_meson.png similarity index 100% rename from Resources/textures/Clothing/glasses_meson.png rename to Resources/Textures/Clothing/glasses_meson.png diff --git a/Resources/textures/Clothing/gloves_yellow.png b/Resources/Textures/Clothing/gloves_yellow.png similarity index 100% rename from Resources/textures/Clothing/gloves_yellow.png rename to Resources/Textures/Clothing/gloves_yellow.png diff --git a/Resources/textures/Clothing/helmet_sec.png b/Resources/Textures/Clothing/helmet_sec.png similarity index 100% rename from Resources/textures/Clothing/helmet_sec.png rename to Resources/Textures/Clothing/helmet_sec.png diff --git a/Resources/textures/Clothing/idcard_standard.png b/Resources/Textures/Clothing/idcard_standard.png similarity index 100% rename from Resources/textures/Clothing/idcard_standard.png rename to Resources/Textures/Clothing/idcard_standard.png diff --git a/Resources/textures/Mob/observer.png b/Resources/Textures/Mob/observer.png similarity index 100% rename from Resources/textures/Mob/observer.png rename to Resources/Textures/Mob/observer.png diff --git a/Resources/textures/Objects/gun.png b/Resources/Textures/Objects/gun.png similarity index 100% rename from Resources/textures/Objects/gun.png rename to Resources/Textures/Objects/gun.png diff --git a/Resources/textures/Objects/laser.png b/Resources/Textures/Objects/laser.png similarity index 100% rename from Resources/textures/Objects/laser.png rename to Resources/Textures/Objects/laser.png diff --git a/Resources/textures/Objects/projectilebullet.png b/Resources/Textures/Objects/projectilebullet.png similarity index 100% rename from Resources/textures/Objects/projectilebullet.png rename to Resources/Textures/Objects/projectilebullet.png diff --git a/Resources/textures/Objects/projectileweapon.png b/Resources/Textures/Objects/projectileweapon.png similarity index 100% rename from Resources/textures/Objects/projectileweapon.png rename to Resources/Textures/Objects/projectileweapon.png