Merge remote-tracking branch 'origin/Animations' into TCPConnections
This commit is contained in:
stiffly
@@ -26,29 +26,25 @@
|
||||
</Components>
|
||||
<Children/>
|
||||
</Entity>
|
||||
<Entity name="Wave">
|
||||
<Entity name="Running">
|
||||
<Components>
|
||||
<c:Animation>
|
||||
<AnimationName1>Run</AnimationName1>
|
||||
<Weight1>0.5</Weight1>
|
||||
<Time1>0.78014858943309839</Time1>
|
||||
<Speed1>1</Speed1>
|
||||
<Time1>0.60188997954429357</Time1>
|
||||
<Speed1>-1</Speed1>
|
||||
<Speed2>1</Speed2>
|
||||
<AnimationName2>StrafeRight</AnimationName2>
|
||||
<Weight2>0.5</Weight2>
|
||||
<Time2>0.78620929522779459</Time2>
|
||||
<AnimationName3>ShootFastRifle</AnimationName3>
|
||||
<Time3>0.13809128482706701</Time3>
|
||||
<Time2>0.96957233017255007</Time2>
|
||||
<Time3>0.093923612201312068</Time3>
|
||||
<Speed3>1</Speed3>
|
||||
</c:Animation>
|
||||
<c:AnimationOffset>
|
||||
<AnimationName>AimRifle</AnimationName>
|
||||
<Time>0.040000014007091522</Time>
|
||||
<Time>0.5</Time>
|
||||
</c:AnimationOffset>
|
||||
<c:Model>
|
||||
<Resource>Models/Characters/Assault/AssaultAnimations.mesh</Resource>
|
||||
<Color A="0.627451003" B="19.6078434" G="1" R="3.92156863"/>
|
||||
<Transparent>true</Transparent>
|
||||
</c:Model>
|
||||
<c:Transform>
|
||||
<Position X="-0.690088332" Y="0" Z="0"/>
|
||||
@@ -62,13 +58,11 @@
|
||||
<ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
|
||||
</c:BoneAttachment>
|
||||
<c:Model>
|
||||
<Resource>Models/Weapons/Blue/AssaultWeapon.mesh</Resource>
|
||||
<Color A="1" B="1" G="1" R="19.6078434"/>
|
||||
<Transparent>true</Transparent>
|
||||
<Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
|
||||
</c:Model>
|
||||
<c:Transform>
|
||||
<Position X="0.144055843" Y="0.970111489" Z="-0.126199633"/>
|
||||
<Orientation X="-0.535831392" Y="0.0691146553" Z="-0.0608282126"/>
|
||||
<Position X="0.161975682" Y="1.06281972" Z="-0.216630161"/>
|
||||
<Orientation X="-0.064812161" Y="-0.0739696771" Z="0.143780142"/>
|
||||
</c:Transform>
|
||||
</Components>
|
||||
<Children/>
|
||||
@@ -78,13 +72,27 @@
|
||||
<Entity>
|
||||
<Components>
|
||||
<c:PointLight>
|
||||
<Color A="1" B="0.70588237" G="0.70588237" R="1"/>
|
||||
<Radius>10</Radius>
|
||||
</c:PointLight>
|
||||
<c:Transform>
|
||||
<Position X="0" Y="1.0823108" Z="0.738871336"/>
|
||||
<Position X="-0.375567257" Y="2.13093901" Z="-0.718547285"/>
|
||||
</c:Transform>
|
||||
</Components>
|
||||
<Children/>
|
||||
<Children>
|
||||
<Entity>
|
||||
<Components>
|
||||
<c:PointLight>
|
||||
<Color A="1" B="1" G="0.70588237" R="0.70588237"/>
|
||||
<Radius>10</Radius>
|
||||
</c:PointLight>
|
||||
<c:Transform>
|
||||
<Position X="-1.96873236" Y="0" Z="0"/>
|
||||
</c:Transform>
|
||||
</Components>
|
||||
<Children/>
|
||||
</Entity>
|
||||
</Children>
|
||||
</Entity>
|
||||
<Entity>
|
||||
<Components>
|
||||
@@ -97,6 +105,43 @@
|
||||
</Components>
|
||||
<Children/>
|
||||
</Entity>
|
||||
<Entity>
|
||||
<Components>
|
||||
<c:Animation>
|
||||
<AnimationName1>ShootFastRifle</AnimationName1>
|
||||
<Time1>0.056234247235838808</Time1>
|
||||
<Speed1>1</Speed1>
|
||||
<Speed2>1</Speed2>
|
||||
<AnimationName2>Idl</AnimationName2>
|
||||
<Weight2>0.5</Weight2>
|
||||
<Time2>1.8308673495784191</Time2>
|
||||
<AnimationName3>StrafeRigh</AnimationName3>
|
||||
<Weight3>0.5</Weight3>
|
||||
<Time3>0.32167823998061529</Time3>
|
||||
<Speed3>1</Speed3>
|
||||
</c:Animation>
|
||||
<c:Model>
|
||||
<Resource>Models/Characters/Assault/AssaultAnimations.mesh</Resource>
|
||||
</c:Model>
|
||||
<c:Transform/>
|
||||
</Components>
|
||||
<Children>
|
||||
<Entity>
|
||||
<Components>
|
||||
<c:BoneAttachment>
|
||||
<BoneName>R_Arm_Weapon_Joint</BoneName>
|
||||
</c:BoneAttachment>
|
||||
<c:Model>
|
||||
<Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
|
||||
</c:Model>
|
||||
<c:Transform>
|
||||
<Position X="0" Y="0.803468645" Z="0"/>
|
||||
</c:Transform>
|
||||
</Components>
|
||||
<Children/>
|
||||
</Entity>
|
||||
</Children>
|
||||
</Entity>
|
||||
</Children>
|
||||
</Entity>
|
||||
</Children>
|
||||
|
||||
@@ -26,57 +26,48 @@
|
||||
</Components>
|
||||
<Children/>
|
||||
</Entity>
|
||||
<Entity name="Wave">
|
||||
<Entity name="Running">
|
||||
<Components>
|
||||
<c:Animation>
|
||||
<AnimationName1>Run</AnimationName1>
|
||||
<Weight1>0.5</Weight1>
|
||||
<Time1>0.97312056690160276</Time1>
|
||||
<Speed1>1</Speed1>
|
||||
<Time1>0.14873348341666759</Time1>
|
||||
<Speed1>-1</Speed1>
|
||||
<Speed2>1</Speed2>
|
||||
<AnimationName2>ReloadSwitch</AnimationName2>
|
||||
<Time2>0.91310356788604263</Time2>
|
||||
<AnimationName3>LeftRight</AnimationName3>
|
||||
<Weight3>0</Weight3>
|
||||
<Time3>0.040207288496060478</Time3>
|
||||
<AnimationName2></AnimationName2>
|
||||
<Weight2>0.5</Weight2>
|
||||
<Time2>0.96957233017255007</Time2>
|
||||
<AnimationName3></AnimationName3>
|
||||
<Time3>0.093923612201312068</Time3>
|
||||
<Speed3>1</Speed3>
|
||||
</c:Animation>
|
||||
<c:AnimationOffset>
|
||||
<AnimationName>DownUp</AnimationName>
|
||||
<Time>0.77999961376190186</Time>
|
||||
<AnimationName>AimRifle</AnimationName>
|
||||
</c:AnimationOffset>
|
||||
<c:Model>
|
||||
<Resource>Models/Characters/Assault/FirstPerson.mesh</Resource>
|
||||
<Color A="0.627451003" B="19.6078434" G="1" R="3.92156863"/>
|
||||
<Transparent>true</Transparent>
|
||||
<Resource>Models/Characters/Assault/AssaultAnimations.mesh</Resource>
|
||||
</c:Model>
|
||||
<c:Transform>
|
||||
<Position X="-0.690088332" Y="1.00491476" Z="0"/>
|
||||
<Position X="-0.690088332" Y="0" Z="0"/>
|
||||
</c:Transform>
|
||||
</Components>
|
||||
<Children>
|
||||
<Entity>
|
||||
<Entity name="R_Arm_Weapon_Joint">
|
||||
<Components>
|
||||
<c:BoneAttachment>
|
||||
<BoneName>R_Arm_Weapon_Joint</BoneName>
|
||||
<ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
|
||||
</c:BoneAttachment>
|
||||
<c:Model>
|
||||
<Resource>Models/Weapons/Blue/AssaultWeapon.mesh</Resource>
|
||||
<Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
|
||||
</c:Model>
|
||||
<c:Transform>
|
||||
<Position X="0.120548911" Y="-0.223148599" Z="-0.151705116"/>
|
||||
<Orientation X="0.09407565" Y="0.0181003436" Z="0.0279055703"/>
|
||||
<Position X="0.106085993" Y="1.24281573" Z="-0.198514819"/>
|
||||
<Orientation X="0.466044426" Y="0.284358948" Z="-0.0190349482"/>
|
||||
</c:Transform>
|
||||
</Components>
|
||||
<Children/>
|
||||
</Entity>
|
||||
<Entity>
|
||||
<Components>
|
||||
<c:Camera/>
|
||||
<c:Transform/>
|
||||
</Components>
|
||||
<Children/>
|
||||
</Entity>
|
||||
</Children>
|
||||
</Entity>
|
||||
<Entity>
|
||||
@@ -101,6 +92,40 @@
|
||||
</Components>
|
||||
<Children/>
|
||||
</Entity>
|
||||
<Entity>
|
||||
<Components>
|
||||
<c:Animation>
|
||||
<AnimationName1>ShootFastRifle</AnimationName1>
|
||||
<Time1>0.11093210511546658</Time1>
|
||||
<Speed1>1</Speed1>
|
||||
</c:Animation>
|
||||
<c:AnimationOffset>
|
||||
<AnimationName>AimRifle</AnimationName>
|
||||
<Time>1</Time>
|
||||
</c:AnimationOffset>
|
||||
<c:Model>
|
||||
<Resource>Models/Characters/Assault/AssaultAnimations.mesh</Resource>
|
||||
</c:Model>
|
||||
<c:Transform/>
|
||||
</Components>
|
||||
<Children>
|
||||
<Entity>
|
||||
<Components>
|
||||
<c:BoneAttachment>
|
||||
<BoneName>R_Arm_Weapon_Joint</BoneName>
|
||||
</c:BoneAttachment>
|
||||
<c:Model>
|
||||
<Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
|
||||
</c:Model>
|
||||
<c:Transform>
|
||||
<Position X="0.106085993" Y="1.24281573" Z="-0.198514819"/>
|
||||
<Orientation X="0.466044426" Y="0.284358948" Z="-0.0190349482"/>
|
||||
</c:Transform>
|
||||
</Components>
|
||||
<Children/>
|
||||
</Entity>
|
||||
</Children>
|
||||
</Entity>
|
||||
</Children>
|
||||
</Entity>
|
||||
</Children>
|
||||
|
||||
Reference in New Issue
Block a user