 William Moberg
|
7e6830af35
|
Merge branch 'master' into Importer
|
2016-03-14 01:09:18 +01:00 |
|
 Teejoon
|
c61d33ebd9
|
NewScorebord
|
2016-03-14 01:08:22 +01:00 |
|
 Jocke
|
1b1963e6d2
|
Reload for assault is only done once now.
|
2016-03-14 01:01:35 +01:00 |
|
|
William Moberg
|
dea57b4872
|
Fixes after merge.
|
2016-03-14 01:00:58 +01:00 |
|
 stiffly
|
3994c0f7ad
|
Merge remote-tracking branch 'origin/master' into PerfectSoundForRelease
|
2016-03-14 00:59:32 +01:00 |
|
|
stiffly
|
1345889e62
|
The win sound plays on win screen
|
2016-03-14 00:58:53 +01:00 |
|
|
Adam Byléhn
|
50abeda99a
|
Merge pull request #218 from teamfisk/DashEffect
Dash effect
|
2016-03-14 00:58:00 +01:00 |
|
 Jace
|
fe6f294986
|
Moved installer script to subdir
|
2016-03-14 00:52:03 +01:00 |
|
 viktorljung
|
424dffd1e0
|
removed shadows on 1st person hands and weapons
added shielded component on 3rd person weapons
|
2016-03-14 00:47:21 +01:00 |
|
|
Jace
|
33ed59fc3a
|
Added files for setup creation
|
2016-03-14 00:45:09 +01:00 |
|
|
William Moberg
|
562afac9d1
|
Merge branch 'master' into Importer
# Conflicts:
# src/Engine/Collision/Collision.cpp
# src/Engine/Collision/CollisionSystem.cpp
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Game/Systems/SpawnerSystem.cpp
|
2016-03-14 00:42:07 +01:00 |
|
|
viktorljung
|
d1c11f20f2
|
Merge remote-tracking branch 'origin/master' into Movement
|
2016-03-14 00:39:16 +01:00 |
|
|
viktorljung
|
1bba40449f
|
Tracers done
|
2016-03-14 00:38:36 +01:00 |
|
 Tleety
|
fd482dd670
|
Axyz logo in menu
|
2016-03-14 00:37:29 +01:00 |
|
|
viktorljung
|
f5343251c5
|
fixed for real now?
|
2016-03-14 00:28:30 +01:00 |
|
|
Tleety
|
c493ebca8e
|
Viewpunch for sidearm and defender
|
2016-03-14 00:23:51 +01:00 |
|
|
William Moberg
|
ef9a449077
|
Merge branch 'master' into DashEffect
|
2016-03-14 00:07:45 +01:00 |
|
|
viktorljung
|
5207248a49
|
3rd person tracers fixed
|
2016-03-14 00:04:51 +01:00 |
|
|
William Moberg
|
12d0c68fbf
|
Weapon should fade on dash effect afterimage.
|
2016-03-13 23:57:47 +01:00 |
|
|
viktorljung
|
1bf65d896a
|
Sidearm tracer fixed
|
2016-03-13 23:42:21 +01:00 |
|
|
stiffly
|
7855cf03d2
|
The Endscreen now works over the network.
|
2016-03-13 23:33:10 +01:00 |
|
|
Tleety
|
b89f68ae2f
|
Merge branch 'master' of github.com:teamfisk/TacticalZ
|
2016-03-13 23:30:26 +01:00 |
|
|
Tleety
|
36185b43ef
|
Killfeed in overwatch camera
|
2016-03-13 23:30:17 +01:00 |
|
|
viktorljung
|
4adf7dc507
|
Assault tracer fixed
|
2016-03-13 23:29:50 +01:00 |
|
|
William Moberg
|
e2686abb16
|
Merge branch 'master' into DashEffect
|
2016-03-13 23:25:38 +01:00 |
|
|
William Moberg
|
be91fc5005
|
WIP dash effect fade weapon 2.
|
2016-03-13 23:23:36 +01:00 |
|
|
William Moberg
|
0084224e18
|
WIP, dash effect fade weapon.
|
2016-03-13 23:23:05 +01:00 |
|
|
viktorljung
|
73bcc6e382
|
Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement
|
2016-03-13 23:12:59 +01:00 |
|
|
viktorljung
|
f393a22011
|
defender tracer fixed
|
2016-03-13 23:12:45 +01:00 |
|
|
Jace
|
9d2ce5af8a
|
Player is now spawned as the correct class that they picked.
|
2016-03-13 23:05:52 +01:00 |
|
|
William Moberg
|
e4145cf292
|
Fixed dash effect to be supported with the new animations using Fade components.
Added bool Loop field in Fade component.
|
2016-03-13 22:49:24 +01:00 |
|
|
stiffly
|
03dab9ca9a
|
Merge remote-tracking branch 'origin/master' into PerfectSoundForRelease
|
2016-03-13 22:33:23 +01:00 |
|
|
Jace
|
fc7f57fd5d
|
Merge remote-tracking branch 'origin/master'
Conflicts:
resources/Schema/Entities/ScoreBoard_Main.xml
|
2016-03-13 22:27:17 +01:00 |
|
 Ayumiwii
|
c20830572c
|
Merge branch 'master' of https://github.com/teamfisk/TacticalZ
|
2016-03-13 22:24:59 +01:00 |
|
|
Ayumiwii
|
00d77607b4
|
new scoreboard
|
2016-03-13 22:24:27 +01:00 |
|
|
stiffly
|
1a120ef345
|
Merge remote-tracking branch 'origin/master' into PerfectSoundForRelease
|
2016-03-13 22:22:41 +01:00 |
|
|
Jace
|
a715f7fe86
|
Merge branch 'master' into Movement
# Conflicts:
# include/Engine/Network/Client.h
# resources/DefaultConfig.ini
# resources/Schema/Entities/OverwatchCamera.xml
# resources/Schema/Types/Entity.xsd
|
2016-03-13 22:22:36 +01:00 |
|
|
stiffly
|
0d823421d8
|
Added win sound file
|
2016-03-13 22:22:19 +01:00 |
|
|
viktorljung
|
d587c9a692
|
Fixed first person strafe animation
|
2016-03-13 22:17:55 +01:00 |
|
|
viktorljung
|
7d32909122
|
Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement
|
2016-03-13 22:14:11 +01:00 |
|
|
Tleety
|
ce2fcd9109
|
Now it works
|
2016-03-13 22:13:37 +01:00 |
|
|
Jace
|
77bb7a0f5c
|
Merge pull request #200 from teamfisk/UnpickableComponent
Added Unpickable component, which skips the entity in the PickingPass
|
2016-03-13 22:09:23 +01:00 |
|
|
Jace
|
78c7d777e3
|
Made player models in class select unpickable
|
2016-03-13 22:09:12 +01:00 |
|
|
viktorljung
|
98bd447084
|
Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement
|
2016-03-13 22:02:45 +01:00 |
|
|
viktorljung
|
fd50ea3a12
|
Defender friendly boost hud
|
2016-03-13 22:02:37 +01:00 |
|
|
Tleety
|
83ae87594f
|
Fixed maxhealth probably
|
2016-03-13 22:00:48 +01:00 |
|
|
Jace
|
53dd96d44d
|
Merge branch 'master' into UnpickableComponent
# Conflicts:
# resources/Schema/Components.xsd
# resources/Schema/Types/Entity.xsd
|
2016-03-13 22:00:10 +01:00 |
|
|
Jace
|
d9b47ddb62
|
Merge branch 'master' of github.com:teamfisk/TacticalZ
|
2016-03-13 21:55:03 +01:00 |
|
|
Jace
|
bc3e699ddb
|
Bumping master to latest assets
|
2016-03-13 21:54:50 +01:00 |
|
 antc13
|
412c92aa7f
|
Merge branch 'master' of https://github.com/teamfisk/TacticalZ
|
2016-03-13 21:51:37 +01:00 |
|