Merge leg and wheel foil textures

Addresses #784
2024-06-11 05:54:07 +00:00 · 2020-01-29 12:18:06 -08:00 · 2020-01-29 12:18:06 -08:00 · 084e10aeb0
commit 084e10aeb0
parent b1e627dc1e
14 changed files with 1 additions and 1 deletions
--- a/Assets/CineboxAndrew
+++ b/Assets/CineboxAndrew
@ -1 +1 @@
-Subproject commit 0b8a3ee6dfe05e5d4f2bdaaf9647bcb461558e0f
+Subproject commit e0d84f6229971bab4b1557380a1f3b9c39e2ac46
--- a/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-ground-1-foil-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-ground-1-foil-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-ground-1-foil-s.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-ground-1-foil-s.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-ground-1-foil.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-ground-1-foil.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-leg-1-rigid.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-leg-1-rigid.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-leg-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-leg-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-legs-1-foil-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-legs-1-foil-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-legs-1-foil-s.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-legs-1-foil-s.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-legs-1-foil.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-legs-1-foil.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheel-1-T.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheel-1-T.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheel-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheel-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheels-1-foil-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheels-1-foil-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheels-1-foil-s.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheels-1-foil-s.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheels-1-foil.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheels-1-foil.dds
		`@ -1 +1 @@`
			`Subproject commit 0b8a3ee6dfe05e5d4f2bdaaf9647bcb461558e0f`				`Subproject commit e0d84f6229971bab4b1557380a1f3b9c39e2ac46`