 Tobias Dahl
|
832a901bf6
|
Merge pull request #220 from teamfisk/Movement
Movement
|
2016-03-14 03:48:47 +01:00 |
|
 maqu14
|
94a10c3a8f
|
New polished map
|
2016-03-14 03:07:58 +01:00 |
|
 Jace
|
cbb2eee003
|
Merge branch 'master' of github.com:teamfisk/TacticalZ
|
2016-03-14 02:53:18 +01:00 |
|
|
Jace
|
f6d85c86c4
|
Added new team pick
|
2016-03-14 02:53:02 +01:00 |
|
|
maqu14
|
8a24a16232
|
Merge branch 'master' of github.com:teamfisk/TacticalZ
# Conflicts:
# resources/DefaultConfig.ini
# resources/Schema/Entities/CP_Rocky2.xml
|
2016-03-14 02:51:09 +01:00 |
|
|
maqu14
|
d850e116fb
|
New map, Some new assets
|
2016-03-14 02:50:24 +01:00 |
|
 Teejoon
|
a4c35e5908
|
Lower Glow intensity on players
|
2016-03-14 02:38:26 +01:00 |
|
|
Teejoon
|
ff881e1f78
|
Merge branch 'master' of https://github.com/teamfisk/TacticalZ
|
2016-03-14 02:16:07 +01:00 |
|
|
Teejoon
|
eb2e79e4cb
|
Players now got lights on them
|
2016-03-14 02:15:56 +01:00 |
|
|
Tleety
|
0b485163c9
|
Changes to menu
|
2016-03-14 01:59:33 +01:00 |
|
 viktorljung
|
a65d8c86d1
|
3rd person reload effect
|
2016-03-14 01:48:48 +01:00 |
|
|
viktorljung
|
0764c9bab2
|
Merge remote-tracking branch 'origin/master' into Movement
|
2016-03-14 01:20:20 +01:00 |
|
|
Teejoon
|
c61d33ebd9
|
NewScorebord
|
2016-03-14 01:08:22 +01:00 |
|
 Adam Byléhn
|
50abeda99a
|
Merge pull request #218 from teamfisk/DashEffect
Dash effect
|
2016-03-14 00:58:00 +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 |
|
|
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 |
|
 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 |
|
|
viktorljung
|
1bf65d896a
|
Sidearm tracer fixed
|
2016-03-13 23:42:21 +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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
Jace
|
78c7d777e3
|
Made player models in class select unpickable
|
2016-03-13 22:09:12 +01:00 |
|
|
viktorljung
|
fd50ea3a12
|
Defender friendly boost hud
|
2016-03-13 22:02:37 +01:00 |
|
 antc13
|
b76bc74c4b
|
Changed glow intensity on some grid walls.
|
2016-03-13 21:51:24 +01:00 |
|
|
viktorljung
|
93f4384da6
|
Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement
|
2016-03-13 21:10:39 +01:00 |
|
|
viktorljung
|
3a0cff7a83
|
boost check for defender
|
2016-03-13 21:10:22 +01:00 |
|
|
Tleety
|
27443d4e08
|
Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement
|
2016-03-13 21:01:15 +01:00 |
|
|
Tleety
|
20e48eeb08
|
Killfeed should work now.
|
2016-03-13 21:01:04 +01:00 |
|
|
antc13
|
be3d75a5cf
|
Merge branch 'master' of https://github.com/teamfisk/TacticalZ
|
2016-03-13 20:48:23 +01:00 |
|
|
antc13
|
b3c935c7cc
|
Fixed rotation/translation on some objects on CP_Rocky2. They somehow got weird rotation values.
|
2016-03-13 20:48:05 +01:00 |
|
|
viktorljung
|
1da3ec3c74
|
ammo share fix?
|
2016-03-13 20:32:08 +01:00 |
|
|
Jace
|
f05b09ca7a
|
Merge branch 'master' of github.com:teamfisk/TacticalZ
|
2016-03-13 19:54:22 +01:00 |
|
|
Jace
|
d3927de7cc
|
Super fancy new class pick, don't overwrite plz
|
2016-03-13 19:51:01 +01:00 |
|
|
viktorljung
|
389d27973f
|
Assault boost check
|
2016-03-13 18:55:45 +01:00 |
|
|
viktorljung
|
0d287ad5d1
|
Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement
# Conflicts:
# resources/Schema/Entities/RayAssaultBlue.xml
|
2016-03-13 16:45:57 +01:00 |
|
|
viktorljung
|
3cee4e4248
|
defender ray fixes
|
2016-03-13 16:42:07 +01:00 |
|
|
Tleety
|
041050ab2f
|
Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement
|
2016-03-13 16:15:26 +01:00 |
|