 viktorljung
|
04fbd0d517
|
Merge branch 'master' of github.com:teamfisk/TacticalZ
|
2016-03-14 04:12:02 +01:00 |
|
|
viktorljung
|
9308e60932
|
Red players
|
2016-03-14 04:11:46 +01:00 |
|
 Jace
|
fc97c4e8ea
|
Merge branch 'master' of github.com:teamfisk/TacticalZ
|
2016-03-14 04:01:40 +01:00 |
|
|
Jace
|
e3767996a1
|
Added DEBUG flags to all debug imgui stuff
|
2016-03-14 04:01:04 +01:00 |
|
 William Moberg
|
809d164eba
|
Merge pull request #221 from teamfisk/PerfectSoundForRelease
Perfect sound for release
|
2016-03-14 03:54:35 +01:00 |
|
 Tobias Dahl
|
5879cb0de4
|
Merge pull request #219 from teamfisk/FixAssaultWeaponReload
Reload for assault is only done once now.
|
2016-03-14 03:48:59 +01:00 |
|
|
Tobias Dahl
|
832a901bf6
|
Merge pull request #220 from teamfisk/Movement
Movement
|
2016-03-14 03:48:47 +01:00 |
|
|
viktorljung
|
8449818cb7
|
Merge branch 'Movement'
|
2016-03-14 03:13:48 +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
|
788d80f721
|
Merge branch 'master' of github.com:teamfisk/TacticalZ
|
2016-03-14 01:59:41 +01:00 |
|
|
Tleety
|
0b485163c9
|
Changes to menu
|
2016-03-14 01:59:33 +01:00 |
|
|
Jace
|
e527badab4
|
Executable name updated to "Axyz"
|
2016-03-14 01:53:20 +01:00 |
|
 stiffly
|
8cef422ea7
|
Merge remote-tracking branch 'origin/master' into PerfectSoundForRelease
# Conflicts:
# resources/Schema/Entities/CP_Rocky2.xml
|
2016-03-14 01:51:51 +01:00 |
|
|
stiffly
|
54a03ddc0f
|
Hurt sound only played for local player.
|
2016-03-14 01:49:37 +01:00 |
|
|
viktorljung
|
a65d8c86d1
|
3rd person reload effect
|
2016-03-14 01:48:48 +01:00 |
|
|
Jace
|
d492b54687
|
Added executable icon to CMakeLists
|
2016-03-14 01:42:14 +01:00 |
|
|
stiffly
|
c1395355c6
|
Removed comment
|
2016-03-14 01:36:11 +01:00 |
|
|
Jace
|
f62f8d53db
|
Merge branch 'Setup'
|
2016-03-14 01:30:49 +01:00 |
|
|
Jace
|
51c7e92fce
|
Fixed redist install
|
2016-03-14 01:29:11 +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 |
|
 Jocke
|
1b1963e6d2
|
Reload for assault is only done once now.
|
2016-03-14 01:01:35 +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 |
|
|
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 |
|