 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 |
|
|
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 |
|
 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 |
|
|
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 |
|
 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 |
|
|
viktorljung
|
68332102ea
|
Can now blend non unique nodes
|
2016-03-03 21:20:55 +01:00 |
|
|
Tleety
|
00c585de3c
|
Score should now track to all clients
|
2016-03-03 20:45:16 +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
|
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 |
|
|
Jocke
|
7943fc7ad6
|
Hot fix: Infinite loop when a player disconnected from the server.
|
2016-03-03 18:14:33 +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
|
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 |
|
|
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 |
|
|
Jocke
|
a9b19d9af1
|
Packet write now only warns when a a packet is huge
|
2016-03-03 13:29:45 +01:00 |
|
|
Tleety
|
96bc5db7bb
|
Merge commit '0e8b97dbbade6bb39c6f2b8af6c1cfc43ce67cde' into ScoreBoard
# Conflicts:
# resources/Schema/Entities/Player.xml
# src/Game/Game.cpp
|
2016-03-03 13:22:28 +01:00 |
|
|
Tleety
|
c8aeae2c96
|
WIP
|
2016-03-03 12:58:35 +01:00 |
|
|
Jocke
|
da81f21799
|
Merge remote-tracking branch 'origin/master' into SniperSprintBranch
# Conflicts:
# include/Engine/Input/FirstPersonInputController.h
|
2016-03-03 12:16:09 +01:00 |
|
|
Jocke
|
cb7beae28c
|
Only do physics and collision calculations on the clients side, and only for their own entity.
|
2016-03-03 11:39:00 +01:00 |
|
|
Tleety
|
ff6e2167d4
|
Some new events and changes to ScoreSystem
|
2016-03-03 11:25:06 +01:00 |
|