- Changes in UpdateNetPlayerPosition

- Holdable items don't try to change the pose if hand anim is disabled (e.g. when dragging someone or using a railgun controller)
- Indicator which shows the position of the sub when spectating
- Bugfix in controller selection logic
- Saving attributes on separate lines in serversettings.xml
- Safer validation of received sub files
This commit is contained in:
Regalis
2016-02-28 14:33:03 +02:00
parent cc4ada952f
commit 00c1edad09
18 changed files with 181 additions and 93 deletions
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<Character name ="mantis" humanoid="false">
<Character name ="mantis" humanoid="false" health="200">
<sound file="Content/Characters/Crawler/attack1.ogg" state="Attack" range="500"/>
<sound file="Content/Characters/Crawler/attack2.ogg" state="Attack" range="500"/>
+6 -6
View File
@@ -1,27 +1,27 @@
<?xml version="1.0" encoding="utf-8" ?>
<Orders>
<Order name="Follow" doingtext="Following" color="1.0,0.5,0.1,1.0">
<Sprite texture="Content/UI/orderSymbols.png" sourcerect="0,0,64,64"/>
<Sprite texture="Content/UI/uiIcons.png" sourcerect="0,0,64,64"/>
</Order>
<Order name="Wait" doingtext="Waiting" color="1.0,0.0,0.0,1.0">
<Sprite texture="Content/UI/orderSymbols.png" sourcerect="128,0,64,64"/>
<Sprite texture="Content/UI/uiIcons.png" sourcerect="128,0,64,64"/>
</Order>
<Order name="Dismissed" doingtext="Dismissed" color="0.0,1.0,0.0,1.0">
<Sprite texture="Content/UI/orderSymbols.png" sourcerect="64,0,64,64"/>
<Sprite texture="Content/UI/uiIcons.png" sourcerect="64,0,64,64"/>
</Order>
<Order name="Operate Reactor" doingtext="Operating Reactor" targetitemtype="Reactor" options="Power up, Shutdown" color="1.0,0.78,0.05,1.0">
<Sprite texture="Content/UI/orderSymbols.png" sourcerect="192,0,64,64"/>
<Sprite texture="Content/UI/uiIcons.png" sourcerect="192,0,64,64"/>
</Order>
<Order name="Operate Railgun" doingtext="Operating Railgun" targetitemtype="Turret" usecontroller="true" options="Fire at will, Hold fire" color="0.12,0.3,0.5,1.0">
<Sprite texture="Content/UI/orderSymbols.png" sourcerect="0,64,64,64"/>
<Sprite texture="Content/UI/uiIcons.png" sourcerect="0,64,64,64"/>
</Order>
<Order name="Fix Leaks" doingtext="Fixing Leaks" color="0.6,0.85,1.0,1.0">
<Sprite texture="Content/UI/orderSymbols.png" sourcerect="64,64,64,64"/>
<Sprite texture="Content/UI/uiIcons.png" sourcerect="64,64,64,64"/>
</Order>
</Orders>
Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB