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
e0de91cce3
WIP
2016-03-09 09:57:32 +01:00
95f68cc888
ConnectRequest event and some other shit
2016-03-08 22:24:32 +01:00
Jace
b7d93058b1
Added base work for dity bits in components
2016-03-08 21:11:59 +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
3394d65055
Servers now show up in the server list.
2016-03-08 18:13:21 +01:00
7ee4ea637b
Merge remote-tracking branch 'origin/master' into TeamPickCamera
2016-03-08 17:30:22 +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
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
f934f972e8
Merge remote-tracking branch 'origin/Weapons' into Movement
...
# Conflicts:
# resources/Schema/Entities/PlayerDefenderBlue.xml
2016-03-08 14:34:21 +01:00
8d1877321a
Fixed BoneAttachment offset rotation
2016-03-08 14:32:50 +01:00
f77a610519
Dash now looking good
2016-03-08 13:26:01 +01:00
d7f09b1a8f
Added clickable buttons to switch to class/team screens, as a better alternative to Comma/Period on the keyboard.
2016-03-08 11:59:15 +01:00
0e0a486c01
AmmoPickupSystem should now be able to give ammo to all classtypes
2016-03-08 11:48:54 +01:00
2ba245368b
Improved movement animaitons
...
Added a SetBlendWeight event that sets the weight for all nodes with a name.
2016-03-08 11:21:40 +01:00
ec3ed1f46f
Merge remote-tracking branch 'origin/master' into Kill-streak-sounds
...
# Conflicts:
# include/Game/Systems/Weapon/DefenderWeaponBehaviour.h
2016-03-08 10:39:52 +01:00
3436ba6656
Merge pull request #177 from teamfisk/AmmoPickup
...
Fixed some systems added twice in Game.cpp
2016-03-08 09:46:36 +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
67ce6c5ae6
Added Speed and Delay fields to explosion effect.
2016-03-07 19:38:02 +01:00
Jace
1a403b9b88
TextFieldReader now loops through parents if the entity field was empty and the current entity didn't have a component of that type.
2016-03-07 17:55:00 +01:00
1516ed8e2d
Removed debug logging. PlayerID in InputCommands from buttons is corrected.
2016-03-07 17:35:01 +01:00
2cfbe0f785
Merge remote-tracking branch 'origin/master' into AmmoPickup
2016-03-07 17:17:51 +01:00
fc3a3a8f2e
Fixed a crashbug in Ammo/HealthPickup which was actually caused by systems being added twice in Game.cpp. This is also a possible fix for DamageIndicator,Capturepoint,TextField,KillFeed
2016-03-07 17:16:18 +01:00
3edc2f4819
Merge pull request #174 from teamfisk/CapturePointFixBranch
...
CapturePoints now have red/blue/spectator model-children
2016-03-07 15:25:22 +01:00
962521fa59
Merge branch 'master' into TeamPickCamera
...
# Conflicts:
# src/Game/Systems/PlayerDeathSystem.cpp
2016-03-07 15:20:46 +01:00
282e0bf7c4
Only set spectator camera if player haven't spawned already. Don't spawn player if they switch to class pick screen.
2016-03-07 15:05:37 +01:00
47ece6a5bf
Changed shield component to track Active, so it and sprint glow full if they are active.
...
Changed how reflections are calculated with light.
2016-03-07 14:42:50 +01:00
64df3fd7ad
CapturePoints now have red/blue/spectator model-children
2016-03-07 14:30:27 +01:00
viktorljung
Jace
Tleety
stiffly
William Moberg
verysecrethero