60c6aa2486
Defender first person tracers done
2016-03-13 02:35:02 +01:00
c0fc36845f
Defender ability HUD fixed
2016-03-12 18:43:04 +01:00
51b8846b3a
Ammo sharing done
2016-03-12 18:29:49 +01:00
dfc30f4693
Boost fixes?
2016-03-12 17:39:50 +01:00
944d10f4bb
Some network fixes with sidearm
2016-03-12 17:34:32 +01:00
f7363eeea4
Boost icon fix
2016-03-12 17:30:28 +01:00
d51ea3cabd
Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement
2016-03-12 17:04:00 +01:00
548efeb11e
EndScreen should now show when a team win
2016-03-12 17:03:50 +01:00
4ba011a098
Ammosharing over network test WIP
2016-03-12 17:01:46 +01:00
01cb3afb4b
Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement
...
# Conflicts:
# resources/Schema/Entities/PlayerAssaultBlue.xml
# resources/Schema/Entities/PlayerDefenderBlue.xml
2016-03-12 15:48:41 +01:00
0b26f23188
3rd person animations idle bug fixed
2016-03-12 15:47:19 +01:00
8c2a665ccb
Some Entities for endscreen and some basic logic in the EndScreenSystem
2016-03-12 15:45:07 +01:00
4334ea067e
System skeleton
2016-03-12 14:44:03 +01:00
8e266984f4
Player HUD should now be ok, color of health still shit tho
2016-03-12 14:37:26 +01:00
060585a388
Aim fixed for all weapons
2016-03-12 02:39:06 +01:00
2a209c5d8e
AmmoSharing beta
2016-03-11 23:58:26 +01:00
e0a6b09d36
Defender early alpha
2016-03-11 19:16:34 +01:00
Jace
1992b6cde1
WIP Defender tracers
2016-03-10 21:15:27 +01:00
Jace
c82be79bb8
Functionally working defender weapon
2016-03-10 19:26:14 +01:00
Jace
e11cdaa662
Removed forced player color on spawn
2016-03-09 20:11:07 +01:00
60ff53112e
Merge remote-tracking branch 'origin/master' into Movement
2016-03-09 18:27:36 +01:00
d42d886dcc
3rd person animations synced with 1st person animations
2016-03-09 18:27:09 +01:00
Jace
1f14087734
Merge branch 'master' of github.com:teamfisk/TacticalZ
2016-03-09 18:02:11 +01:00
Jace
0b58f32f32
Fixed third person animations over network
2016-03-09 18:01:32 +01:00
99ccca6273
Merge remote-tracking branch 'origin/master' into FriendlyHost/Join
2016-03-09 17:38:37 +01:00
d093284569
Rename variable
2016-03-09 17:37:40 +01:00
7e7d98eaae
Merge remote-tracking branch 'origin/master' into Menu
2016-03-09 17:24:41 +01:00
1104166039
TextureSprite Resource that use GL_NEAREST for sampling aswell as some StartMenu changes
2016-03-09 17:24:21 +01:00
7141756992
Merge remote-tracking branch 'origin/Weapons' into Movement
...
# Conflicts:
# resources/Schema/Entities/Player.xml
# resources/Schema/Entities/PlayerAssaultBlue.xml
# resources/Schema/Entities/PlayerAssaultFallbackBlue.xml
# resources/Schema/Entities/PlayerAssaultFallbackRed.xml
# resources/Schema/Entities/PlayerAssaultRed.xml
# resources/Schema/Entities/aaaatestremoveme.xml
# resources/Schema/Entities/aim_rays.xml
2016-03-09 15:59:36 +01:00
de125663fd
Merge remote-tracking branch 'origin/master' into Movement
...
# Conflicts:
# assets
# resources/Schema/Entities/Player.xml
# resources/Schema/Entities/PlayerAssaultFallbackBlue.xml
# resources/Schema/Entities/PlayerAssaultFallbackRed.xml
# resources/Schema/Entities/PlayerAssaultRed.xml
# resources/Schema/Entities/aaaatestremoveme.xml
# resources/Schema/Entities/aim_rays.xml
# src/Engine/Rendering/BoneAttachmentSystem.cpp
2016-03-09 15:54:00 +01:00
Jace
34e551663f
Merge remote-tracking branch 'origin/master' into Weapons
...
# Conflicts:
# assets
# resources/Schema/Entities/Player.xml
# resources/Schema/Entities/PlayerAssaultFallbackBlue.xml
# resources/Schema/Entities/PlayerAssaultFallbackRed.xml
# resources/Schema/Entities/PlayerAssaultRed.xml
# resources/Schema/Entities/aaaatestremoveme.xml
# resources/Schema/Entities/aim_rays.xml
2016-03-09 15:52:13 +01:00
Jace
9d368348d5
Updated 3rd person and 1st person animation trees for assault to allow for third person weapon animations
2016-03-09 15:48:57 +01:00
49040e9c4b
StartMenu system now sets the main menu camera to active as long as it exists.
2016-03-09 15:29:42 +01:00
a76a04260f
StartSystem skeleton and some changes to the StartMenu
2016-03-09 15:10:54 +01:00
877defdfee
Merge remote-tracking branch 'origin/master' into FriendlyHost/Join
2016-03-09 14:47:24 +01:00
6f69b52358
Merge remote-tracking branch 'origin/Menu' into FriendlyHost/Join
2016-03-09 14:34:41 +01:00
500ebfa08c
Menu should now show the correct server IP instead of default.
...
Start of a StartMenu entity that will show when the game is started.
2016-03-09 14:34:02 +01:00
09171a1a18
WIP connect from menu
2016-03-09 14:33:20 +01:00
4ae39dcc36
Merge pull request #182 from teamfisk/DamageIndicator
...
Friendly fire gives no DamageIndicator
2016-03-09 13:26:57 +01:00
70ec075887
3rd person aim improvements
2016-03-09 13:19:56 +01:00
c9c462f695
The console now print some info when you are trying to connect to server
2016-03-09 12:31:37 +01:00
704242597a
Merge remote-tracking branch 'origin/master' into Menu
...
# Conflicts:
# resources/Schema/Components.xsd
# resources/Schema/Entities/NewMapWSpectatorCam.xml
# resources/Schema/Types/Entity.xsd
# src/Game/Game.cpp
2016-03-09 11:49:42 +01:00
00478b4f12
Merge pull request #184 from teamfisk/TeamPickCamera
...
Tiny compiler bug fix.
2016-03-09 11:46:30 +01:00
f24a5a36b4
Tiny compiler bug fix.
2016-03-09 11:44:07 +01:00
697da620d3
Merge pull request #179 from teamfisk/TeamPickCamera
...
Spectator camera system
2016-03-09 11:41:05 +01:00
534d6639e5
Class enum instead of hardcoded ints.
...
Removed superfluous .Valid() checks.
Check for spectator spawnrequest in case they somehow has a class, so we don't get "x players were supposed to be spawned but failed" if it happens.
2016-03-09 11:35:32 +01:00
6456df8ce1
DamageIndicator is now disabled for Friendly fire
2016-03-09 10:44:08 +01:00
95f68cc888
ConnectRequest event and some other shit
2016-03-08 22:24:32 +01:00
6c673db2f4
Merge branch 'TeamPickCamera' of github.com:teamfisk/TacticalZ into TeamPickCamera
2016-03-08 19:24:55 +01:00
7bc3c9f7b1
Don't force to spectator camera if player presses pickTeam/Class prematurely. Players team should be remembered after picked, spawn request is not erased anymore.
2016-03-08 18:26:17 +01:00
viktorljung
Tleety
Jace
stiffly
William Moberg
verysecrethero