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

Merge remote-tracking branch 'origin/Menu' into WeaponSystem

Browse Source 
# Conflicts:
#	resources/Schema/Entities/Player.xml
#	resources/Schema/Types/Entity.xsd
#	src/Game/Systems/PlayerSpawnSystem.cpp
This commit is contained in:
sippeangelo
2016-02-12 07:18:20 +01:00
parent 78e318c032 f146971db0
commit 47f4711b85
13 changed files with 1593 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/Schema/Entities/Player.xml
+60 -6
View File
@@ -306,13 +306,67 @@
</Entity>
</Children>
</Entity>
<Entity name="KillFeed">
<Components>
<c:KillFeed/>
<c:Transform>
<Position X="0.486000031" Y="0.266000003" Z="0"/>
<Scale X="0.00999999978" Y="0.00999999978" Z="0.00999999978"/>
</c:Transform>
</Components>
<Children>
<Entity name="KillFeed1">
<Components>
<c:Text>
<Content></Content>
<Resource>Fonts/DroidSans.ttf,64</Resource>
<Alignment>
<Right/>
</Alignment>
</c:Text>
<c:Transform/>
</Components>
<Children/>
</Entity>
<Entity name="KillFeed2">
<Components>
<c:Text>
<Content></Content>
<Resource>Fonts/DroidSans.ttf,64</Resource>
<Alignment>
<Right/>
</Alignment>
</c:Text>
<c:Transform>
<Position X="0" Y="-1" Z="0"/>
</c:Transform>
</Components>
<Children/>
</Entity>
<Entity name="KillFeed3">
<Components>
<c:Text>
<Content></Content>
<Resource>Fonts/DroidSans.ttf,64</Resource>
<Alignment>
<Right/>
</Alignment>
</c:Text>
<c:Transform>
<Position X="0" Y="-2" Z="0"/>
</c:Transform>
</Components>
<Children/>
</Entity>
</Children>
</Entity>
</Children>
</Entity>
<Entity name="Hands">
<Components>
<c:Animation>
<AnimationName1>Idle</AnimationName1>
<Time1>0.1719161089749548</Time1>
<Time1>1.6050530664521858</Time1>
<Speed1>1</Speed1>
</c:Animation>
<c:Model>
@@ -332,8 +386,8 @@
<Transparent>true</Transparent>
</c:Model>
<c:Transform>
<Position X="0.120430604" Y="-0.229735136" Z="-0.181454614"/>
<Orientation X="0.0104046864" Y="-0.00268157595" Z="0.0428441279"/>
<Position X="0.12043035" Y="-0.234149337" Z="-0.181454644"/>
<Orientation X="0.0104045281" Y="-0.00268131681" Z="0.0428438708"/>
</c:Transform>
</Components>
<Children>
@@ -439,7 +493,7 @@
<Components>
<c:Animation>
<AnimationName1>Idle</AnimationName1>
<Time1>1.8038469763698401</Time1>
<Time1>1.620305457513453</Time1>
<Speed1>1</Speed1>
</c:Animation>
<c:AnimationOffset>
@@ -464,8 +518,8 @@
<Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
</c:Model>
<c:Transform>
<Position X="0.158596605" Y="1.02875519" Z="-0.215406924"/>
<Orientation X="-0.0626692027" Y="-0.0361935981" Z="0.120094992"/>
<Position X="0.160351232" Y="1.02591991" Z="-0.215102971"/>
<Orientation X="-0.0627480298" Y="-0.0432248674" Z="0.119431816"/>
</c:Transform>
</Components>
<Children>