f24a5a36b4
Tiny compiler bug fix.
2016-03-09 11:44:07 +01:00
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
b782e73556
Falsified DepthSort for SpectatorCamera buttons and CP-HUD elements.
2016-03-09 10:56:05 +01:00
6c673db2f4
Merge branch 'TeamPickCamera' of github.com:teamfisk/TacticalZ into TeamPickCamera
2016-03-08 19:24:55 +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
7ee4ea637b
Merge remote-tracking branch 'origin/master' into TeamPickCamera
2016-03-08 17:30:22 +01:00
d7f09b1a8f
Added clickable buttons to switch to class/team screens, as a better alternative to Comma/Period on the keyboard.
2016-03-08 11:59:15 +01:00
3436ba6656
Merge pull request #177 from teamfisk/AmmoPickup
...
Fixed some systems added twice in Game.cpp
2016-03-08 09:46:36 +01:00
fcf87104c3
Replaced test textures for class picking with more proper icons.
2016-03-07 17:50:03 +01:00
1516ed8e2d
Removed debug logging. PlayerID in InputCommands from buttons is corrected.
2016-03-07 17:35:01 +01:00
fc3a3a8f2e
Fixed a crashbug in Ammo/HealthPickup which was actually caused by systems being added twice in Game.cpp. This is also a possible fix for DamageIndicator,Capturepoint,TextField,KillFeed
2016-03-07 17:16:18 +01:00
3edc2f4819
Merge pull request #174 from teamfisk/CapturePointFixBranch
...
CapturePoints now have red/blue/spectator model-children
2016-03-07 15:25:22 +01:00
962521fa59
Merge branch 'master' into TeamPickCamera
...
# Conflicts:
# src/Game/Systems/PlayerDeathSystem.cpp
2016-03-07 15:20:46 +01:00
9c3fa25834
Merge pull request #176 from teamfisk/PlayerHUD
...
Player hud
2016-03-07 15:14:37 +01:00
282e0bf7c4
Only set spectator camera if player haven't spawned already. Don't spawn player if they switch to class pick screen.
2016-03-07 15:05:37 +01:00
3eaad275ba
New CapturePointAddition fixed to work on Network by Joachim
2016-03-07 14:50:31 +01:00
47ece6a5bf
Changed shield component to track Active, so it and sprint glow full if they are active.
...
Changed how reflections are calculated with light.
2016-03-07 14:42:50 +01:00
64df3fd7ad
CapturePoints now have red/blue/spectator model-children
2016-03-07 14:30:27 +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
388fe7c259
Fixed some stuff on the player HUD
2016-03-07 11:28:10 +01:00
46d7c8bea4
Merge pull request #172 from teamfisk/ScoreBoard
...
Score board
2016-03-07 11:09:17 +01:00
c7099de9e4
Merge remote-tracking branch 'origin/master' into ScoreBoard
...
# Conflicts:
# assets
2016-03-07 10:58:55 +01:00
cb9dad5c67
Merge remote-tracking branch 'origin/master' into ScoreBoard
2016-03-07 10:49:57 +01:00
a8f2d0a8e6
Some assets, some fixes to the scoreboard
2016-03-07 10:48:46 +01:00
Jace
b7a7f7fd5e
????
2016-03-04 15:02:01 +01:00
Jace
434ff1e7eb
????
2016-03-04 10:06:49 +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
Jace
4557455e49
HUD stuff
2016-03-04 09:41:12 +01:00
c1f5cf65a7
Movement animations
2016-03-04 09:39:16 +01:00
Jace
a8ad85b004
Merge remote-tracking branch 'origin/IconsForPlaytest' into Weapons
2016-03-04 09:39:11 +01:00
Jace
3ac8a5c7ef
Working map
2016-03-04 09:38:38 +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
5b80ba4398
Made 3 new healthHUDs 1 for each class.
2016-03-04 08:22:48 +01:00
03843774d7
Moved buttons and fixed so you can't spawn with no class.
2016-03-04 07:01:47 +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
2187df080a
Merge branch 'master' into IconsForPlaytest
2016-03-04 05:17:54 +01:00
eec40b6519
We can now read larger packets than 65536 bytes in TCPClient::readBuffer()
2016-03-04 05:10:18 +01:00
Jace
177667eef5
The only working branch ever
2016-03-04 05:02:25 +01:00
1f047ea300
Latest Map version (Hopefully) Now with textures. Made some very minor tweaks as well, by removing duplicated meshes.
2016-03-04 04:22:04 +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
19ee66fc75
Fix
2016-03-04 03:57:37 +01:00
7675af1ef6
Merge pull request #168 from teamfisk/SniperSprintBranch
...
Sniper sprint effect
2016-03-04 03:31:53 +01:00
William Moberg
verysecrethero
Tobias Dahl
Adam Byléhn
Jace
viktorljung
Jocke
antc13