The only working branch ever

This commit is contained in:
2016-03-04 05:02:25 +01:00
parent dbafab2cef
commit 177667eef5
17 changed files with 1385 additions and 618 deletions
+75 -54
View File
@@ -484,12 +484,10 @@
</Entity>
<Entity name="Hands">
<Components>
<c:Blend>
<Pose1>BlendTreeAssaultWeapon</Pose1>
<Pose2>BlendTreeSecondaryWeapon</Pose2>
<Weight>0</Weight>
<SubTreeRoot>true</SubTreeRoot>
</c:Blend>
<c:BlendAdditive>
<Adder>Run</Adder>
<Receiver>FinalBlend</Receiver>
</c:BlendAdditive>
<c:Model>
<Resource>Models/Characters/Defender/FirstPersonDefenderBlue.mesh</Resource>
</c:Model>
@@ -508,8 +506,8 @@
<EntityFile>Schema/Entities/WeaponAssaultBlueView.xml</EntityFile>
</c:Spawner>
<c:Transform>
<Position X="0.120430678" Y="-0.228860483" Z="-0.181454629"/>
<Orientation X="0.0104048448" Y="-0.00268179015" Z="0.0428442247"/>
<Position X="0.120525226" Y="-0.23723805" Z="-0.18130067"/>
<Orientation X="-0.00823593792" Y="-0.00347058685" Z="0.0434750468"/>
</c:Transform>
</Components>
<Children/>
@@ -526,50 +524,73 @@
<EntityFile>Schema/Entities/SidearmWeaponView.xml</EntityFile>
</c:Spawner>
<c:Transform>
<Position X="0.120430678" Y="-0.228860483" Z="-0.181454629"/>
<Orientation X="0.0104048448" Y="-0.00268179015" Z="0.0428442247"/>
<Position X="0.120525226" Y="-0.23723805" Z="-0.18130067"/>
<Orientation X="-0.00823593792" Y="-0.00347058685" Z="0.0434750468"/>
</c:Transform>
</Components>
<Children/>
</Entity>
<Entity name="BlendTreeAssaultWeapon">
<Entity name="FinalBlend">
<Components>
<c:Blend>
<Pose1>Idle</Pose1>
<Pose2>WeaponAction</Pose2>
<Pose1>BlendTreeAssaultWeapon</Pose1>
<Pose2>BlendTreeSecondaryWeapon</Pose2>
<Weight>0</Weight>
<SubTreeRoot>true</SubTreeRoot>
</c:Blend>
<c:Transform/>
</Components>
<Children>
<Entity name="WeaponAction">
<Entity name="BlendTreeAssaultWeapon">
<Components>
<c:Blend>
<Pose1>Fire</Pose1>
<Pose2>Reload</Pose2>
<Weight>1</Weight>
<Pose1>Idle</Pose1>
<Pose2>WeaponAction</Pose2>
<Weight>0</Weight>
<SubTreeRoot>true</SubTreeRoot>
</c:Blend>
<c:Transform/>
</Components>
<Children>
<Entity name="Fire">
<Entity name="WeaponAction">
<Components>
<c:Animation>
<AnimationName>ShootShotgunF</AnimationName>
<Speed>1</Speed>
<Play>true</Play>
<Loop>false</Loop>
</c:Animation>
<c:Blend>
<Pose1>Fire</Pose1>
<Pose2>Reload</Pose2>
<Weight>0</Weight>
</c:Blend>
<c:Transform/>
</Components>
<Children/>
<Children>
<Entity name="Fire">
<Components>
<c:Animation>
<AnimationName>ShootShotgunF</AnimationName>
<Speed>1</Speed>
<Loop>false</Loop>
</c:Animation>
<c:Transform/>
</Components>
<Children/>
</Entity>
<Entity name="Reload">
<Components>
<c:Animation>
<AnimationName>ReloadSwitchF</AnimationName>
<Speed>1</Speed>
<Loop>false</Loop>
</c:Animation>
<c:Transform/>
</Components>
<Children/>
</Entity>
</Children>
</Entity>
<Entity name="Reload">
<Entity name="Idle">
<Components>
<c:Animation>
<AnimationName>ReloadSwitchF</AnimationName>
<Time>0.58991607886241582</Time>
<AnimationName>IdleF</AnimationName>
<Time>0.97212039472333345</Time>
<Speed>1</Speed>
<Play>true</Play>
</c:Animation>
@@ -579,22 +600,22 @@
</Entity>
</Children>
</Entity>
<Entity name="Idle">
<Entity name="BlendTreeSecondaryWeapon">
<Components>
<c:Animation>
<AnimationName>IdleF</AnimationName>
<Time>0.14837891922093149</Time>
<Speed>1</Speed>
<Play>true</Play>
</c:Animation>
<c:Transform/>
</Components>
<Children/>
</Entity>
</Children>
</Entity>
<Entity name="BlendTreeSecondaryWeapon">
<Entity name="Run">
<Components>
<c:Animation>
<AnimationName>RunF</AnimationName>
<Time>0.51068473950665805</Time>
<Speed>1</Speed>
<Additive>true</Additive>
</c:Animation>
<c:Transform/>
</Components>
<Children/>
@@ -651,8 +672,8 @@
<EntityFile>Schema/Entities/WeaponAssaultBlueWorld.xml</EntityFile>
</c:Spawner>
<c:Transform>
<Position X="0.156692833" Y="1.04078996" Z="-0.230734348"/>
<Orientation X="-0.00423099846" Y="-0.0376685001" Z="0.137512475"/>
<Position X="0.157275528" Y="1.04134643" Z="-0.233016849"/>
<Orientation X="-0.00424382696" Y="-0.0348230973" Z="0.137522101"/>
</c:Transform>
</Components>
<Children/>
@@ -672,8 +693,8 @@
<EntityFile>Schema/Entities/SidearmWeaponWorld.xml</EntityFile>
</c:Spawner>
<c:Transform>
<Position X="0.156692833" Y="1.04078996" Z="-0.230734348"/>
<Orientation X="-0.00423099846" Y="-0.0376685001" Z="0.137512475"/>
<Position X="0.157275528" Y="1.04134643" Z="-0.233016849"/>
<Orientation X="-0.00424382696" Y="-0.0348230973" Z="0.137522101"/>
</c:Transform>
</Components>
<Children/>
@@ -780,7 +801,7 @@
<Components>
<c:Animation>
<AnimationName>CrouchStrafeLeftF</AnimationName>
<Time>0.86105870560012221</Time>
<Time>0.68480018110252416</Time>
<Speed>1</Speed>
<Play>true</Play>
</c:Animation>
@@ -792,7 +813,7 @@
<Components>
<c:Animation>
<AnimationName>CrouchStrafeRightF</AnimationName>
<Time>0.78838016755090479</Time>
<Time>0.61212164305330674</Time>
<Speed>1</Speed>
<Play>true</Play>
</c:Animation>
@@ -806,7 +827,7 @@
<Components>
<c:Animation>
<AnimationName>CrouchWalkF</AnimationName>
<Time>0.56675415272830776</Time>
<Time>0.39049562823070971</Time>
<Speed>1</Speed>
<Play>true</Play>
</c:Animation>
@@ -863,7 +884,7 @@
<Components>
<c:Animation>
<AnimationName>WalkF</AnimationName>
<Time>0.071908782138081051</Time>
<Time>0.89565025764048301</Time>
<Speed>1</Speed>
<Play>true</Play>
</c:Animation>
@@ -875,7 +896,7 @@
<Components>
<c:Animation>
<AnimationName>RunF</AnimationName>
<Time>0.34392228616198395</Time>
<Time>0.1676637616643859</Time>
<Speed>1</Speed>
<Play>true</Play>
</c:Animation>
@@ -895,11 +916,11 @@
<c:Transform/>
</Components>
<Children>
<Entity name="Left">
<Entity name="Right">
<Components>
<c:Animation>
<AnimationName>StrafeLeftF</AnimationName>
<Time>0.25350140317161873</Time>
<AnimationName>StrafeRightF</AnimationName>
<Time>0.10075840855413531</Time>
<Speed>1</Speed>
<Play>true</Play>
</c:Animation>
@@ -907,11 +928,11 @@
</Components>
<Children/>
</Entity>
<Entity name="Right">
<Entity name="Left">
<Components>
<c:Animation>
<AnimationName>StrafeRightF</AnimationName>
<Time>0.27701693305173336</Time>
<AnimationName>StrafeLeftF</AnimationName>
<Time>0.077242878674020687</Time>
<Speed>1</Speed>
<Play>true</Play>
</c:Animation>
@@ -927,7 +948,7 @@
<Components>
<c:Animation>
<AnimationName>IdleF</AnimationName>
<Time>0.07079692416292005</Time>
<Time>0.027866837470497785</Time>
<Speed>1</Speed>
<Play>true</Play>
</c:Animation>
@@ -1096,7 +1117,7 @@
<Components>
<c:Animation>
<AnimationName>IdleAssaultRifleU</AnimationName>
<Time>1.4961314671805894</Time>
<Time>0.31987294268299138</Time>
<Speed>1</Speed>
<Play>true</Play>
</c:Animation>
@@ -1108,7 +1129,7 @@
<Components>
<c:Animation>
<AnimationName>IdleSecWepU</AnimationName>
<Time>1.4996565074703767</Time>
<Time>0.32339798297277866</Time>
<Speed>1</Speed>
<Play>true</Play>
</c:Animation>