534d6639e5
Class enum instead of hardcoded ints.
...
Removed superfluous .Valid() checks.
Check for spectator spawnrequest in case they somehow has a class, so we don't get "x players were supposed to be spawned but failed" if it happens.
2016-03-09 11:35:32 +01:00
7bc3c9f7b1
Don't force to spectator camera if player presses pickTeam/Class prematurely. Players team should be remembered after picked, spawn request is not erased anymore.
2016-03-08 18:26:17 +01:00
962521fa59
Merge branch 'master' into TeamPickCamera
...
# Conflicts:
# src/Game/Systems/PlayerDeathSystem.cpp
2016-03-07 15:20:46 +01:00
99d663d5a2
ShiftIcon should now track ability depending on what ability the player has and change icon accordingly.
2016-03-07 13:55:37 +01:00
Jace
b7a7f7fd5e
????
2016-03-04 15:02:01 +01:00
0dfe00b406
Unlocks mouse when changing to SpectatorCamera and locking when respawning.
2016-03-04 09:49:27 +01:00
Jace
e58b5ffd6f
Merge remote-tracking branch 'origin/Movement' into Weapons
...
# Conflicts:
# resources/Schema/Entities/Player.xml
# src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp
2016-03-04 09:43:34 +01:00
c1f5cf65a7
Movement animations
2016-03-04 09:39:16 +01:00
Jace
ebd4c58c41
"Fixed" weapon spawning over network
2016-03-04 09:23:18 +01:00
Jace
42cccfbac0
Merge branch 'Weapons' of github.com:teamfisk/TacticalZ into Weapons
...
# Conflicts:
# assets
# src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp
2016-03-04 08:56:58 +01:00
e2674d915e
Constrained weapon behavior to client side only
2016-03-04 08:55:55 +01:00
Jace
2b55450c18
Cray cray weapons
2016-03-04 08:54:59 +01:00
7ba0e4ea9d
Run, Strafe and jump animations now playing
2016-03-04 08:35:02 +01:00
7a2f1ac9fd
Merge branch 'Weapons' into TeamPickCamera
2016-03-04 08:34:27 +01:00
d78a7e20e2
Merge branch 'master' into Weapons
2016-03-04 08:29:33 +01:00
2ecc53ecca
Merge branch 'master' into TeamPickCamera
...
# Conflicts:
# src/Game/Game.cpp
2016-03-04 05:58:49 +01:00
06614aa907
SpectatorCameraSystem handles the overwatch cameras. Set camera to a class pick screen when connecting. Cannot spawn until both team and class has been picked.
...
Preparations for class aware PlayerSpawnSystem.
2016-03-04 05:41:29 +01:00
Jace
177667eef5
The only working branch ever
2016-03-04 05:02:25 +01:00
e6472b9745
Merge pull request #170 from teamfisk/ScoreBoard
...
I Hope To God That This Works.
2016-03-04 04:03:46 +01:00
7675af1ef6
Merge pull request #168 from teamfisk/SniperSprintBranch
...
Sniper sprint effect
2016-03-04 03:31:53 +01:00
0e95c5bb95
Fixes
2016-03-04 02:52:04 +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
1ff91a5c5d
fixup! Blend duration can now be 0.0
...
Commited input test stuff
2016-03-04 02:30:05 +01:00
49802fed91
Blend duration can now be 0.0
2016-03-04 02:24:13 +01:00
778bbd13ca
double's should now be displayed with only 1 decimal.
2016-03-04 02:19:13 +01:00
1616fb20d1
Skinned meshes now in T-Pose when not it's blendtree is null
2016-03-04 02:03:50 +01:00
00b5a1771c
Should now work fully, not KD tho
2016-03-04 01:34:29 +01:00
66374b7ff9
Should now track score correctly
2016-03-04 00:21:01 +01:00
fe7c1dd808
Merge remote-tracking branch 'origin/DeathEventUsesPlayerID' into ScoreBoard
...
# Conflicts:
# include/Engine/Network/Server.h
2016-03-03 23:56:57 +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
2167b6f7b1
Fix for previous commit..
2016-03-03 23:43:50 +01:00
bebdacabb4
Clean up
2016-03-03 23:41:08 +01:00
66c8a17b17
Merge remote-tracking branch 'origin/master' into Animations
...
# Conflicts:
# resources/Schema/Types/Entity.xsd
2016-03-03 23:21:14 +01:00
e3fbd2082c
BlendQueues fully working
2016-03-03 23:20:13 +01:00
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
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
b1148c0c6c
Added a afterimage SprintEffect for the Sniper.
2016-03-03 21:24:31 +01:00
00c585de3c
Score should now track to all clients
2016-03-03 20:45:16 +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
2dfcd3ad95
Merge pull request #158 from teamfisk/SniperSprintBranch
...
Looks good// William
2016-03-03 18:25:38 +01:00
be331cb778
fixed
2016-03-03 18:05:10 +01:00
a3494b92c8
Blending queues now working
2016-03-03 17:48:25 +01:00
a72dc94d5d
Merge branch 'SniperSprintBranch' of github.com:teamfisk/TacticalZ into SniperSprintBranch
...
# Conflicts:
# include/Engine/Input/FirstPersonInputController.h
2016-03-03 17:35:17 +01:00
c5f3bfc0cd
Fixed the stuff in comments
2016-03-03 17:33:41 +01:00
8b86c73ecc
Merge remote-tracking branch 'origin/FixNetworkBugs' into ScoreBoard
2016-03-03 15:49:15 +01:00
c125f8c5f5
Merge branch 'master' into ScoreBoard
2016-03-03 15:18:46 +01:00
73b8bff1f3
Revert "Shadows"
2016-03-03 14:24:43 +01:00
William Moberg
Tleety
Jace
viktorljung
Jocke
stiffly
verysecrethero