Merge branch 'master' into WeaponSystem

2016-02-11 12:58:09 +01:00
parent 81943516a9 ccf4cae74b
commit 95289f47d6
4 changed files with 2415 additions and 12 deletions
@@ -9,8 +9,14 @@
    <Entity>
      <Components>
        <c:SceneLight/>
+        <c:Transform/>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
        <c:Model>
-          <Resource>Models/Test/SplatMapTest.mesh</Resource>
+          <Resource>Models/Ground.mesh</Resource>
        </c:Model>
        <c:Transform/>
      </Components>