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
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
4ae39dcc36
Merge pull request #182 from teamfisk/DamageIndicator
...
Friendly fire gives no DamageIndicator
2016-03-09 13:26:57 +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
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
95f68cc888
ConnectRequest event and some other shit
2016-03-08 22:24:32 +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
3394d65055
Servers now show up in the server list.
2016-03-08 18:13:21 +01:00
280de0e984
Merge remote-tracking branch 'origin/FriendlyHost/Join' into Menu
...
# Conflicts:
# include/Game/Systems/MainMenuSystem.h
# src/Engine/GUI/MainMenuSystem.cpp
2016-03-08 17:03:50 +01:00
17e2ebeaa7
Merge remote-tracking branch 'origin/master' into FriendlyHost/Join
...
# Conflicts:
# include/Engine/Network/Client.h
2016-03-08 16:59:24 +01:00
1d8b5abfde
Fuck aff
2016-03-08 16:53:35 +01:00
ba9208085b
WIP
2016-03-08 16:52:56 +01:00
52d3cb3ebf
GetPlayerAmmo is now a SetPlayerAmmo instead to fix some potential problems if the player has no weapon at all
2016-03-08 16:33:08 +01:00
f8ab52c72c
WIP
2016-03-08 16:15:54 +01:00
e43a7be7db
DamageIndicatorSystem now works for singleplayer again. Friendly fire DamageIndicator is now black color.
2016-03-08 15:55:51 +01:00
0e0a486c01
AmmoPickupSystem should now be able to give ammo to all classtypes
2016-03-08 11:48:54 +01:00
01f29b6d4e
Blur behind buttons/sprites should now be working as intended.
2016-03-08 11:14:09 +01:00
6b7f598c4d
WIP
2016-03-07 23:35:58 +01:00
5c0d9070c7
WIP
2016-03-07 23:25:06 +01:00
Jace
3fda25b604
Working first person animations for AssaultWeapon and DefenderWeapon and reload effect for AssaultWeapon
2016-03-07 19:38:49 +01:00
Jace
f923872e51
fixup! Disabled InputCommand processing while you fiddle with editor UI elements
2016-03-07 17:54:01 +01:00
962521fa59
Merge branch 'master' into TeamPickCamera
...
# Conflicts:
# src/Game/Systems/PlayerDeathSystem.cpp
2016-03-07 15:20:46 +01:00
99d663d5a2
ShiftIcon should now track ability depending on what ability the player has and change icon accordingly.
2016-03-07 13:55:37 +01:00
Jace
b7a7f7fd5e
????
2016-03-04 15:02:01 +01:00
0dfe00b406
Unlocks mouse when changing to SpectatorCamera and locking when respawning.
2016-03-04 09:49:27 +01:00
Jace
e58b5ffd6f
Merge remote-tracking branch 'origin/Movement' into Weapons
...
# Conflicts:
# resources/Schema/Entities/Player.xml
# src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp
2016-03-04 09:43:34 +01:00
c1f5cf65a7
Movement animations
2016-03-04 09:39:16 +01:00
Jace
ebd4c58c41
"Fixed" weapon spawning over network
2016-03-04 09:23:18 +01:00
Jace
42cccfbac0
Merge branch 'Weapons' of github.com:teamfisk/TacticalZ into Weapons
...
# Conflicts:
# assets
# src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp
2016-03-04 08:56:58 +01:00
e2674d915e
Constrained weapon behavior to client side only
2016-03-04 08:55:55 +01:00
Jace
2b55450c18
Cray cray weapons
2016-03-04 08:54:59 +01:00
7ba0e4ea9d
Run, Strafe and jump animations now playing
2016-03-04 08:35:02 +01:00
7a2f1ac9fd
Merge branch 'Weapons' into TeamPickCamera
2016-03-04 08:34:27 +01:00
d78a7e20e2
Merge branch 'master' into Weapons
2016-03-04 08:29:33 +01:00
2ecc53ecca
Merge branch 'master' into TeamPickCamera
...
# Conflicts:
# src/Game/Game.cpp
2016-03-04 05:58:49 +01:00
06614aa907
SpectatorCameraSystem handles the overwatch cameras. Set camera to a class pick screen when connecting. Cannot spawn until both team and class has been picked.
...
Preparations for class aware PlayerSpawnSystem.
2016-03-04 05:41:29 +01:00
Jace
177667eef5
The only working branch ever
2016-03-04 05:02:25 +01:00
e6472b9745
Merge pull request #170 from teamfisk/ScoreBoard
...
I Hope To God That This Works.
2016-03-04 04:03:46 +01:00
7675af1ef6
Merge pull request #168 from teamfisk/SniperSprintBranch
...
Sniper sprint effect
2016-03-04 03:31:53 +01:00
0e95c5bb95
Fixes
2016-03-04 02:52:04 +01:00
Jace
608e339172
Merge remote-tracking branch 'origin/Animations' into Weapons
2016-03-04 02:48:41 +01:00
Jace
3a8f7c5d03
First attempt at AssaultWeapon animations!
2016-03-04 02:48:03 +01:00
1ff91a5c5d
fixup! Blend duration can now be 0.0
...
Commited input test stuff
2016-03-04 02:30:05 +01:00
49802fed91
Blend duration can now be 0.0
2016-03-04 02:24:13 +01:00
778bbd13ca
double's should now be displayed with only 1 decimal.
2016-03-04 02:19:13 +01:00
Tleety
Jace
William Moberg
stiffly
verysecrethero
viktorljung
Jocke