 Jocke
|
5b80ba4398
|
Made 3 new healthHUDs 1 for each class.
|
2016-03-04 08:22:48 +01:00 |
|
|
Jocke
|
2187df080a
|
Merge branch 'master' into IconsForPlaytest
|
2016-03-04 05:17:54 +01:00 |
|
 Jace
|
177667eef5
|
The only working branch ever
|
2016-03-04 05:02:25 +01:00 |
|
 antc13
|
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 |
|
|
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
|
2507516a85
|
Tweaked values for the effect to look better
|
2016-03-04 03:28:58 +01:00 |
|
|
Jace
|
3a8f7c5d03
|
First attempt at AssaultWeapon animations!
|
2016-03-04 02:48:03 +01:00 |
|
|
Tleety
|
778bbd13ca
|
double's should now be displayed with only 1 decimal.
|
2016-03-04 02:19:13 +01:00 |
|
|
antc13
|
86306b3132
|
Merge branch 'master' of https://github.com/teamfisk/TacticalZ
# Conflicts:
# resources/Schema/Entities/NewMap2version2.xml
|
2016-03-04 01:15:42 +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 |
|
 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 |
|
|
Tleety
|
011aa53bc0
|
ScoreScreen things
|
2016-03-03 22:55:18 +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
|
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
|
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 |
|
|
Jace
|
e55a399bad
|
Merge pull request #165 from teamfisk/PickClassCamera
Pick class camera
|
2016-03-03 18:41:04 +01:00 |
|
|
viktorljung
|
a3494b92c8
|
Blending queues now working
|
2016-03-03 17:48:25 +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 |
|
|
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 |
|
|
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 |
|
|
maqu14
|
2cd39c7188
|
New map version (NewMap2version4NEW)
|
2016-03-03 13:31:17 +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 |
|
|
Tleety
|
ff6e2167d4
|
Some new events and changes to ScoreSystem
|
2016-03-03 11:25:06 +01:00 |
|