 Tleety
|
c7099de9e4
|
Merge remote-tracking branch 'origin/master' into ScoreBoard
# Conflicts:
# assets
|
2016-03-07 10:58:55 +01:00 |
|
|
Tleety
|
cb9dad5c67
|
Merge remote-tracking branch 'origin/master' into ScoreBoard
|
2016-03-07 10:49:57 +01:00 |
|
|
Tleety
|
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 |
|
|
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 |
|
 viktorljung
|
c1f5cf65a7
|
Movement animations
|
2016-03-04 09:39:16 +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 |
|
 Jocke
|
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 |
|
|
viktorljung
|
7ba0e4ea9d
|
Run, Strafe and jump animations now playing
|
2016-03-04 08:35:02 +01:00 |
|
|
Jocke
|
d78a7e20e2
|
Merge branch 'master' into Weapons
|
2016-03-04 08:29:33 +01:00 |
|
|
Jace
|
177667eef5
|
The only working branch ever
|
2016-03-04 05:02:25 +01:00 |
|
|
Joachim Pettersson
|
e6472b9745
|
Merge pull request #170 from teamfisk/ScoreBoard
I Hope To God That This Works.
|
2016-03-04 04:03:46 +01:00 |
|
|
Tleety
|
19ee66fc75
|
Fix
|
2016-03-04 03:57:37 +01:00 |
|
|
Tobias Dahl
|
7675af1ef6
|
Merge pull request #168 from teamfisk/SniperSprintBranch
Sniper sprint effect
|
2016-03-04 03:31:53 +01:00 |
|
|
Jocke
|
0398006fdc
|
added safety ifs and renamed dasheffect to sprinteffect
|
2016-03-04 03:19:41 +01:00 |
|
|
Jace
|
dbafab2cef
|
fixup! First attempt at AssaultWeapon animations!
|
2016-03-04 03:07:36 +01:00 |
|
|
Tleety
|
103fe98fe2
|
KD now updated
|
2016-03-04 03:06:42 +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 |
|
|
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
|
3a8f7c5d03
|
First attempt at AssaultWeapon animations!
|
2016-03-04 02:48:03 +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 |
|
|
Tleety
|
00b5a1771c
|
Should now work fully, not KD tho
|
2016-03-04 01:34:29 +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
|
7e6d32aaec
|
Fixed AssaultWeapon reload logic
|
2016-03-03 23:45:28 +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 |
|
 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 |
|
|
Jocke
|
ae13a2db6b
|
Player cannot see their own sprint effect.
|
2016-03-03 22:09:51 +01:00 |
|
|
Jocke
|
b1148c0c6c
|
Added a afterimage SprintEffect for the Sniper.
|
2016-03-03 21:24:31 +01:00 |
|
|
Tleety
|
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 |
|
|
Jace
|
e55a399bad
|
Merge pull request #165 from teamfisk/PickClassCamera
Pick class camera
|
2016-03-03 18:41:04 +01:00 |
|
|
Joachim Pettersson
|
2dfcd3ad95
|
Merge pull request #158 from teamfisk/SniperSprintBranch
Looks good// William
|
2016-03-03 18:25:38 +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 |
|
|
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
|
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 |
|
|
Jocke
|
a9b19d9af1
|
Packet write now only warns when a a packet is huge
|
2016-03-03 13:29:45 +01:00 |
|