 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 |
|
|
Joachim Pettersson
|
2dfcd3ad95
|
Merge pull request #158 from teamfisk/SniperSprintBranch
Looks good// William
|
2016-03-03 18:25:38 +01:00 |
|
|
Adam Byléhn
|
44924ea1f9
|
Merge pull request #166 from teamfisk/FixNetworkBugs
Hot fix: Infinite loop when a player disconnected from the server.
|
2016-03-03 18:22:13 +01:00 |
|
|
Jocke
|
7943fc7ad6
|
Hot fix: Infinite loop when a player disconnected from the server.
|
2016-03-03 18:14:33 +01:00 |
|
 verysecrethero
|
be331cb778
|
fixed
|
2016-03-03 18:05:10 +01:00 |
|
|
viktorljung
|
a3494b92c8
|
Blending queues now working
|
2016-03-03 17:48:25 +01:00 |
|
|
verysecrethero
|
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 |
|
|
verysecrethero
|
c5f3bfc0cd
|
Fixed the stuff in comments
|
2016-03-03 17:33:41 +01:00 |
|
 William Moberg
|
98366ec038
|
PickClass used for class-picking, SwapToClassPick to swap camera.
|
2016-03-03 16:59:17 +01:00 |
|
|
William Moberg
|
398bc725b6
|
When pick class buttons are clicked they send an InputCommand, not an ButtonClicked event.
|
2016-03-03 16:32:24 +01:00 |
|
|
Tleety
|
3e9ad7dc14
|
Merge remote-tracking branch 'origin/master' into ScoreBoard
|
2016-03-03 15:57:26 +01:00 |
|
|
Tobias Dahl
|
fe36e8b423
|
Merge pull request #164 from teamfisk/FixNetworkBugs
Fixed invisible players and connect crash.
|
2016-03-03 15:57:02 +01:00 |
|
|
Tleety
|
8b86c73ecc
|
Merge remote-tracking branch 'origin/FixNetworkBugs' into ScoreBoard
|
2016-03-03 15:49:15 +01:00 |
|
|
William Moberg
|
8859f652b9
|
Input ClassPick now switches to a camera with class buttons, they do nothing now and have test textures.
|
2016-03-03 15:48:55 +01:00 |
|
|
Tleety
|
c125f8c5f5
|
Merge branch 'master' into ScoreBoard
|
2016-03-03 15:18:46 +01:00 |
|
|
stiffly
|
a7bff92899
|
The readBuffer now checks if the whole packet has arrived before attempting to parse it.
|
2016-03-03 15:16:42 +01:00 |
|
 FakeShemp
|
315eac1af9
|
try not to assume things.
|
2016-03-03 15:10:27 +01:00 |
|
|
FakeShemp
|
4ee52b74bf
|
Fix broken shader in.
|
2016-03-03 15:04:10 +01:00 |
|
|
FakeShemp
|
d2f47e754f
|
Remove shitty commented out thingie causing an error
|
2016-03-03 14:46:01 +01:00 |
|
|
Tobias Dahl
|
bfcf7b240e
|
Merge pull request #163 from teamfisk/revert-145-Shadows
Revert "Shadows"
|
2016-03-03 14:25:10 +01:00 |
|
|
Tobias Dahl
|
73b8bff1f3
|
Revert "Shadows"
|
2016-03-03 14:24:43 +01:00 |
|
|
Tleety
|
ed1d203c72
|
Merge branch 'master' into ScoreBoard
|
2016-03-03 14:07:44 +01:00 |
|
|
Tobias Dahl
|
1deb506fb2
|
Merge pull request #145 from teamfisk/Shadows
Shadows
|
2016-03-03 14:06:48 +01:00 |
|
|
viktorljung
|
8957b0b464
|
Merge remote-tracking branch 'origin/master' into Animations
|
2016-03-03 14:05:43 +01:00 |
|
|
Tleety
|
f4983cf961
|
WIP
|
2016-03-03 13:53:40 +01:00 |
|
|
Jace
|
1210c91535
|
Added Gameplay.AutoReload bool to config
|
2016-03-03 13:51:47 +01:00 |
|
|
Jocke
|
ae3cab6cd1
|
Merge remote-tracking branch 'origin/master' into FixNetworkBugs
|
2016-03-03 13:31:43 +01:00 |
|
|
maqu14
|
2cd39c7188
|
New map version (NewMap2version4NEW)
|
2016-03-03 13:31:17 +01:00 |
|
|
Jocke
|
a9b19d9af1
|
Packet write now only warns when a a packet is huge
|
2016-03-03 13:29:45 +01:00 |
|
|
maqu14
|
9c1a638a41
|
New map (NewMap2version4NEW)
|
2016-03-03 13:28:18 +01:00 |
|