BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into AssaultBoost

Browse Source
This commit is contained in:
verysecrethero
2016-02-17 14:58:28 +01:00
parent f7303ad787 0d665c10fe
commit e8aff02c4e
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/Schema/Entities/AmmoPickup.xml
+6 -1
View File
@@ -5,10 +5,15 @@
<c:AABB/> <c:AABB/>
<c:AmmoPickup/> <c:AmmoPickup/>
<c:Model> <c:Model>
<Resource>Models/Core/UnitSphere.mesh</Resource> <Resource>Models/Props/PickUps/AmmoPickUp.mesh</Resource>
</c:Model> </c:Model>
<c:RaptorCopter>
<Speed>0.1</Speed>
<Axis X="0" Y="1" Z="0"/>
</c:RaptorCopter>
<c:Transform> <c:Transform>
<Position X="0" Y="1" Z="0"/> <Position X="0" Y="1" Z="0"/>
<Scale X="0.3" Y="0.3" Z="0.3"/>
</c:Transform> </c:Transform>
<c:Trigger/> <c:Trigger/>
</Components> </Components>
resources/Schema/Entities/HealthPickup.xml
+6 -1
View File
@@ -5,10 +5,15 @@
<c:AABB/> <c:AABB/>
<c:HealthPickup/> <c:HealthPickup/>
<c:Model> <c:Model>
<Resource>Models/Core/UnitSphere.mesh</Resource> <Resource>Models/Props/PickUps/HealthPickUp.mesh</Resource>
</c:Model> </c:Model>
<c:RaptorCopter>
<Speed>0.1</Speed>
<Axis X="0" Y="1" Z="0"/>
</c:RaptorCopter>
<c:Transform> <c:Transform>
<Position X="0" Y="1" Z="0"/> <Position X="0" Y="1" Z="0"/>
<Scale X="0.3" Y="0.3" Z="0.3"/>
</c:Transform> </c:Transform>
<c:Trigger/> <c:Trigger/>
</Components> </Components>