 Jace
|
609f6619a6
|
Merge remote-tracking branch 'origin/Animations' into Weapons
|
2016-03-04 03:04:36 +01:00 |
|
|
Jace
|
03ea9bcf40
|
fixup! Duration no longer needed
|
2016-03-04 03:00:03 +01:00 |
|
|
Jace
|
d37b7c2277
|
fixup! First attempt at AssaultWeapon animations!
|
2016-03-04 02:55:19 +01:00 |
|
 viktorljung
|
1bd71931b8
|
Fixed crash when trying to blend to a nonexistent node
|
2016-03-04 02:53:23 +01:00 |
|
 Tleety
|
0e95c5bb95
|
Fixes
|
2016-03-04 02:52:04 +01:00 |
|
|
Jace
|
b7fa7f9119
|
Duration no longer needed
|
2016-03-04 02:50:03 +01:00 |
|
|
Jace
|
608e339172
|
Merge remote-tracking branch 'origin/Animations' into Weapons
|
2016-03-04 02:48:41 +01:00 |
|
|
Jace
|
3a8f7c5d03
|
First attempt at AssaultWeapon animations!
|
2016-03-04 02:48:03 +01:00 |
|
|
viktorljung
|
1ff91a5c5d
|
fixup! Blend duration can now be 0.0
Commited input test stuff
|
2016-03-04 02:30:05 +01:00 |
|
|
viktorljung
|
49802fed91
|
Blend duration can now be 0.0
|
2016-03-04 02:24:13 +01:00 |
|
|
Tleety
|
45991000ae
|
Removed unused code
|
2016-03-04 02:20:42 +01:00 |
|
|
Tleety
|
778bbd13ca
|
double's should now be displayed with only 1 decimal.
|
2016-03-04 02:19:13 +01:00 |
|
|
viktorljung
|
1616fb20d1
|
Skinned meshes now in T-Pose when not it's blendtree is null
|
2016-03-04 02:03:50 +01:00 |
|
|
Tleety
|
00b5a1771c
|
Should now work fully, not KD tho
|
2016-03-04 01:34:29 +01:00 |
|
 antc13
|
86306b3132
|
Merge branch 'master' of https://github.com/teamfisk/TacticalZ
# Conflicts:
# resources/Schema/Entities/NewMap2version2.xml
|
2016-03-04 01:15:42 +01:00 |
|
|
Tleety
|
66374b7ff9
|
Should now track score correctly
|
2016-03-04 00:21:01 +01:00 |
|
|
Tleety
|
fe7c1dd808
|
Merge remote-tracking branch 'origin/DeathEventUsesPlayerID' into ScoreBoard
# Conflicts:
# include/Engine/Network/Server.h
|
2016-03-03 23:56:57 +01:00 |
|
|
Tleety
|
118d61c711
|
Should now remove players from scoreboard if they disconnect
|
2016-03-03 23:55:52 +01:00 |
|
|
Jace
|
4dd46e2e21
|
Merge branch 'master' into Weapons
|
2016-03-03 23:46:46 +01:00 |
|
|
Jace
|
7e6d32aaec
|
Fixed AssaultWeapon reload logic
|
2016-03-03 23:45:28 +01:00 |
|
|
Jace
|
9426942988
|
Merge pull request #169 from teamfisk/Animations
Animations
|
2016-03-03 23:45:24 +01:00 |
|
 stiffly
|
2167b6f7b1
|
Fix for previous commit..
|
2016-03-03 23:43:50 +01:00 |
|
|
viktorljung
|
bebdacabb4
|
Clean up
|
2016-03-03 23:41:08 +01:00 |
|
|
viktorljung
|
66c8a17b17
|
Merge remote-tracking branch 'origin/master' into Animations
# Conflicts:
# resources/Schema/Types/Entity.xsd
|
2016-03-03 23:21:14 +01:00 |
|
|
viktorljung
|
e3fbd2082c
|
BlendQueues fully working
|
2016-03-03 23:20:13 +01:00 |
|
|
Jace
|
217c3fe55c
|
Fixes
|
2016-03-03 22:58:45 +01:00 |
|
|
Tleety
|
0a21fe15dd
|
Merge remote-tracking branch 'origin/master' into ScoreBoard
# Conflicts:
# resources/Schema/Components.xsd
# resources/Schema/Entities/Player.xml
# resources/Schema/Types/Entity.xsd
|
2016-03-03 22:56:39 +01:00 |
|
|
Tleety
|
011aa53bc0
|
ScoreScreen things
|
2016-03-03 22:55:18 +01:00 |
|
|
stiffly
|
714665f0a3
|
Updated the PlayerID getter in Server.cpp.
|
2016-03-03 22:55:12 +01:00 |
|
|
stiffly
|
8466a282b7
|
The server will now parse a death event and pass it forward with a KillDeath event to the score system.
|
2016-03-03 22:48:42 +01:00 |
|
|
Jace
|
80ad76c023
|
Merge branch 'Playtest2-Fallback' of github.com:teamfisk/TacticalZ into Playtest2-Fallback
|
2016-03-03 22:25:46 +01:00 |
|
|
Jace
|
c84d7ebb8f
|
PlayerAssaultFallbackBlue and PlayerAssaultFallbackRed
|
2016-03-03 22:25:07 +01:00 |
|
 Jocke
|
ae13a2db6b
|
Player cannot see their own sprint effect.
|
2016-03-03 22:09:51 +01:00 |
|
|
Jocke
|
984b8ad3e9
|
SprintEffect defaults to 30% extra speed.
|
2016-03-03 21:57:27 +01:00 |
|
|
Tleety
|
f5ea4e06c7
|
Map
|
2016-03-03 21:37:18 +01:00 |
|
|
Jocke
|
b1148c0c6c
|
Added a afterimage SprintEffect for the Sniper.
|
2016-03-03 21:24:31 +01:00 |
|
|
viktorljung
|
68332102ea
|
Can now blend non unique nodes
|
2016-03-03 21:20:55 +01:00 |
|
|
Jace
|
6532e9896e
|
fixup! Playtest 2 Fallback Map
|
2016-03-03 21:05:21 +01:00 |
|
|
Jace
|
e24a0b127b
|
Added Ability cooldown UI and missing texture
|
2016-03-03 20:59:30 +01:00 |
|
|
Tleety
|
00c585de3c
|
Score should now track to all clients
|
2016-03-03 20:45:16 +01:00 |
|
|
Jace
|
c0e160833c
|
Playtest 2 Fallback Map
|
2016-03-03 20:43:28 +01:00 |
|
|
Jace
|
cbb2ec2fd6
|
Unique ids for entity nodes in the editor to prevent weird behaviour when multiple entities have the same name
|
2016-03-03 20:43:28 +01:00 |
|
|
Jace
|
c467d54d44
|
Merge pull request #167 from teamfisk/Weapons
Working Assault Weapon
|
2016-03-03 20:43:13 +01:00 |
|
|
Jace
|
0e5810d39e
|
Merge branch 'master' into Weapons
|
2016-03-03 20:41:50 +01:00 |
|
|
Jace
|
eba296196c
|
Merge remote-tracking branch 'origin/master' into Weapons
# Conflicts:
# src/Game/Game.cpp
|
2016-03-03 20:05:10 +01:00 |
|
|
Jace
|
b2371f4a43
|
Working AssaultWeapon
|
2016-03-03 20:00:42 +01:00 |
|
 maqu14
|
f1c5df1418
|
Merge branch 'master' of github.com:teamfisk/TacticalZ
|
2016-03-03 19:58:53 +01:00 |
|
|
Jocke
|
a5c1e34b8d
|
Merge remote-tracking branch 'origin/master' into SniperSprintBranch
|
2016-03-03 18:49:42 +01:00 |
|
|
Jace
|
e55a399bad
|
Merge pull request #165 from teamfisk/PickClassCamera
Pick class camera
|
2016-03-03 18:41:04 +01:00 |
|
|
Jocke
|
06b7052bf2
|
Merge remote-tracking branch 'origin/master' into SniperSprintBranch
|
2016-03-03 18:26:47 +01:00 |
|