Final pass

This commit is contained in:
FakeShemp
2016-02-04 10:54:34 +01:00
parent 4769970715
commit cf43817658
15 changed files with 23 additions and 23 deletions
+2 -2
View File
@@ -20,7 +20,7 @@
<Entity> <Entity>
<Components> <Components>
<c:Model> <c:Model>
<Resource>Models/dummyscene.mesh</Resource> <Resource>Models/Test/DummyScene.mesh</Resource>
</c:Model> </c:Model>
<c:Transform> <c:Transform>
<Position X="0" Y="-0" Z="0"/> <Position X="0" Y="-0" Z="0"/>
@@ -31,7 +31,7 @@
<Entity> <Entity>
<Components> <Components>
<c:Model> <c:Model>
<Resource>Models/animtest.</Resource> <Resource>Models/Test/AnimTest.mesh</Resource>
</c:Model> </c:Model>
<c:Transform> <c:Transform>
<Position X="-0.0966923237" Y="1.2939688" Z="0.399702221"/> <Position X="-0.0966923237" Y="1.2939688" Z="0.399702221"/>
+1 -1
View File
@@ -9,7 +9,7 @@
<Entity> <Entity>
<Components> <Components>
<c:Model> <c:Model>
<Resource>Models/DummyScene.mesh</Resource> <Resource>Models/Test/DummyScene.mesh</Resource>
</c:Model> </c:Model>
<c:Transform/> <c:Transform/>
</Components> </Components>
@@ -9,7 +9,7 @@
<Entity> <Entity>
<Components> <Components>
<c:Model> <c:Model>
<Resource>Models/DummyScene.mesh</Resource> <Resource>Models/Test/DummyScene.mesh</Resource>
</c:Model> </c:Model>
<c:Transform/> <c:Transform/>
</Components> </Components>
@@ -9,7 +9,7 @@
<Entity> <Entity>
<Components> <Components>
<c:Model> <c:Model>
<Resource>Models/DummyScene.mesh</Resource> <Resource>Models/Test/DummyScene.mesh</Resource>
</c:Model> </c:Model>
<c:Transform/> <c:Transform/>
</Components> </Components>
@@ -9,7 +9,7 @@
<Entity> <Entity>
<Components> <Components>
<c:Model> <c:Model>
<Resource>Models/DummyScene.mesh</Resource> <Resource>Models/Test/DummyScene.mesh</Resource>
</c:Model> </c:Model>
<c:Transform/> <c:Transform/>
</Components> </Components>
@@ -9,7 +9,7 @@
<Entity> <Entity>
<Components> <Components>
<c:Model> <c:Model>
<Resource>Models/DummyScene.mesh</Resource> <Resource>Models/Test/DummyScene.mesh</Resource>
</c:Model> </c:Model>
<c:Transform/> <c:Transform/>
</Components> </Components>
@@ -160,7 +160,7 @@
<Entity> <Entity>
<Components> <Components>
<c:Model> <c:Model>
<Resource>Models/DummyScene.mesh</Resource> <Resource>Models/Test/DummyScene.mesh</Resource>
</c:Model> </c:Model>
<c:Transform> <c:Transform>
<Position X="-0.600000024" Y="0" Z="0"/> <Position X="-0.600000024" Y="0" Z="0"/>
@@ -6,7 +6,7 @@
<Orientation X="0" Y="0" Z="0"/> <Orientation X="0" Y="0" Z="0"/>
</c:Transform> </c:Transform>
<c:Model> <c:Model>
<Resource>Models/DummyScene.mesh</Resource> <Resource>Models/Test/DummyScene.mesh</Resource>
</c:Model> </c:Model>
</Components> </Components>
<Children> <Children>
+1 -1
View File
@@ -89,7 +89,7 @@
<Entity name="Crosshair"> <Entity name="Crosshair">
<Components> <Components>
<c:Model> <c:Model>
<Resource>Models/CrosshairQuad.mesh</Resource> <Resource>Models/Weapons/CrosshairQuad.mesh</Resource>
</c:Model> </c:Model>
<c:Transform> <c:Transform>
<Position X="0" Y="0" Z="0.200000003"/> <Position X="0" Y="0" Z="0.200000003"/>
@@ -797,7 +797,7 @@
<Entity name="Asset"> <Entity name="Asset">
<Components> <Components>
<c:Model> <c:Model>
<Resource>Models/SecondaryWeapon.mesh</Resource> <Resource>Models/Weapons/SecondaryWeapon.mesh</Resource>
</c:Model> </c:Model>
<c:Transform> <c:Transform>
<Position X="0" Y="1" Z="0"/> <Position X="0" Y="1" Z="0"/>
@@ -844,7 +844,7 @@
<Entity name="Asset"> <Entity name="Asset">
<Components> <Components>
<c:Model> <c:Model>
<Resource>Models/AssualtSoft.mesh</Resource> <Resource>Models/Test/AssaultTPoseSoftEdge.mesh</Resource>
</c:Model> </c:Model>
<c:Transform> <c:Transform>
<Position X="0" Y="0.5" Z="0"/> <Position X="0" Y="0.5" Z="0"/>
@@ -984,7 +984,7 @@
<Entity name="Asset"> <Entity name="Asset">
<Components> <Components>
<c:Model> <c:Model>
<Resource>Models/Assualt.mesh</Resource> <Resource>Models/Test/AssaultTPoseHardEdge.mesh</Resource>
</c:Model> </c:Model>
<c:Transform> <c:Transform>
<Position X="0" Y="0.5" Z="0"/> <Position X="0" Y="0.5" Z="0"/>
@@ -1021,7 +1021,7 @@
<Entity name="RedTeamHomeCapturePoint"> <Entity name="RedTeamHomeCapturePoint">
<Components> <Components>
<c:Model> <c:Model>
<Resource>Models/CapturePoint.mesh</Resource> <Resource>Models/Props/CapturePoint.mesh</Resource>
</c:Model> </c:Model>
<c:Transform> <c:Transform>
<Position X="0" Y="0" Z="-30"/> <Position X="0" Y="0" Z="-30"/>
@@ -1073,7 +1073,7 @@
<Entity name="RedMiddleCapturePoint"> <Entity name="RedMiddleCapturePoint">
<Components> <Components>
<c:Model> <c:Model>
<Resource>Models/CapturePoint.mesh</Resource> <Resource>Models/Props/CapturePoint.mesh</Resource>
</c:Model> </c:Model>
<c:Transform> <c:Transform>
<Position X="0" Y="0" Z="-15"/> <Position X="0" Y="0" Z="-15"/>
@@ -1118,7 +1118,7 @@
<Entity name="MiddleCapturePoint"> <Entity name="MiddleCapturePoint">
<Components> <Components>
<c:Model> <c:Model>
<Resource>Models/CapturePoint.mesh</Resource> <Resource>Models/Props/CapturePoint.mesh</Resource>
</c:Model> </c:Model>
<c:Transform/> <c:Transform/>
</Components> </Components>
@@ -1161,7 +1161,7 @@
<Entity name="BlueMiddleCaapturePoint"> <Entity name="BlueMiddleCaapturePoint">
<Components> <Components>
<c:Model> <c:Model>
<Resource>Models/CapturePoint.mesh</Resource> <Resource>Models/Props/CapturePoint.mesh</Resource>
</c:Model> </c:Model>
<c:Transform> <c:Transform>
<Position X="0" Y="0" Z="15"/> <Position X="0" Y="0" Z="15"/>
@@ -1207,7 +1207,7 @@
<Entity name="BlueTeamHomeCapturePoint"> <Entity name="BlueTeamHomeCapturePoint">
<Components> <Components>
<c:Model> <c:Model>
<Resource>Models/CapturePoint.mesh</Resource> <Resource>Models/Props/CapturePoint.mesh</Resource>
</c:Model> </c:Model>
<c:Transform> <c:Transform>
<Position X="0" Y="0" Z="30"/> <Position X="0" Y="0" Z="30"/>
+1 -1
View File
@@ -6,7 +6,7 @@
<Lifetime>0.25</Lifetime> <Lifetime>0.25</Lifetime>
</c:Lifetime> </c:Lifetime>
<c:Model> <c:Model>
<Resource>Models/CylinderBullet.mesh</Resource> <Resource>Models/Weapons/CylinderBullet.mesh</Resource>
<Color A="0.156862751" B="39.2156868" G="7.84313726" R="0"/> <Color A="0.156862751" B="39.2156868" G="7.84313726" R="0"/>
<Transparent>true</Transparent> <Transparent>true</Transparent>
</c:Model> </c:Model>
+1 -1
View File
@@ -6,7 +6,7 @@
<Lifetime>0.25</Lifetime> <Lifetime>0.25</Lifetime>
</c:Lifetime> </c:Lifetime>
<c:Model> <c:Model>
<Resource>Models/CylinderBullet.mesh</Resource> <Resource>Models/Weapons/CylinderBullet.mesh</Resource>
<Color A="0.156862751" B="0" G="0.525490224" R="39.2156868"/> <Color A="0.156862751" B="0" G="0.525490224" R="39.2156868"/>
<Transparent>true</Transparent> <Transparent>true</Transparent>
</c:Model> </c:Model>
+1 -1
View File
@@ -20,7 +20,7 @@
<Entity name="Model"> <Entity name="Model">
<Components> <Components>
<c:Model> <c:Model>
<Resource>Models/Assault.obj</Resource> <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
<Color A="1" B="3.92156863" G="3.92156863" R="3.92156863"/> <Color A="1" B="3.92156863" G="3.92156863" R="3.92156863"/>
</c:Model> </c:Model>
<c:Transform> <c:Transform>
+1 -1
View File
@@ -9,7 +9,7 @@
<Entity> <Entity>
<Components> <Components>
<c:Model> <c:Model>
<Resource>Models/DummyScene.mesh</Resource> <Resource>Models/Test/DummyScene.mesh</Resource>
</c:Model> </c:Model>
<c:Transform/> <c:Transform/>
</Components> </Components>
+1 -1
View File
@@ -6,7 +6,7 @@
<Orientation X="0" Y="0" Z="0"/> <Orientation X="0" Y="0" Z="0"/>
</c:Transform> </c:Transform>
<c:Model> <c:Model>
<Resource>Models/DummyScene.mesh</Resource> <Resource>Models/Test/DummyScene.mesh</Resource>
</c:Model> </c:Model>
</Components> </Components>
<Children> <Children>