Merge branch 'master' of psychoscientists.com:ZetaKebab/SevenStars

2018-09-02 20:21:33 +02:00 · 2018-09-02 20:21:33 +02:00 · 9cca220015
commit 9cca220015
parent 801df4cd21 f8c585c3ed
17 changed files with 0 additions and 0 deletions
--- a/Content/Geometry/Meshes/curtain.uasset
+++ b/Content/Geometry/Meshes/curtain.uasset
--- a/Content/Geometry/Meshes/floor.uasset
+++ b/Content/Geometry/Meshes/floor.uasset
--- a/Content/Geometry/Meshes/gold.uasset
+++ b/Content/Geometry/Meshes/gold.uasset
--- a/Content/Material/carrelage.png
+++ b/Content/Material/carrelage.png
--- a/Content/Material/carrelage.uasset
+++ b/Content/Material/carrelage.uasset
--- a/Content/Material/carrelageMetal.png
+++ b/Content/Material/carrelageMetal.png
--- a/Content/Material/carrelageMetal.uasset
+++ b/Content/Material/carrelageMetal.uasset
--- a/Content/Material/carrelageNormal.png
+++ b/Content/Material/carrelageNormal.png
--- a/Content/Material/carrelageNormal.uasset
+++ b/Content/Material/carrelageNormal.uasset
--- a/Content/Material/carrelageRoughness.png
+++ b/Content/Material/carrelageRoughness.png
--- a/Content/Material/carrelageRoughness.uasset
+++ b/Content/Material/carrelageRoughness.uasset
--- a/Content/Material/motif1.png
+++ b/Content/Material/motif1.png
--- a/Content/Material/motif1.uasset
+++ b/Content/Material/motif1.uasset
--- a/Content/Material/motif2a.png
+++ b/Content/Material/motif2a.png
--- a/Content/Material/motif2a.uasset
+++ b/Content/Material/motif2a.uasset
--- a/Content/Material/motif2aNormal.png
+++ b/Content/Material/motif2aNormal.png
--- a/Content/Material/motif2aNormal.uasset
+++ b/Content/Material/motif2aNormal.uasset