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
fa0b52caec
When you disconnect you will delete the world and return to the menu.
2016-03-09 15:49:42 +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
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
67ccb5bee5
Merge remote-tracking branch 'origin/master' into FriendlyHost/Join
2016-03-09 13:23:31 +01:00
12dd1d21de
Text now handles color, alpha and icon parsing
2016-03-09 12:11:26 +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
d7c30450dc
Should now read servername from config.
2016-03-09 10:08:23 +01:00
4abe73eae7
Merge remote-tracking branch 'origin/master' into FriendlyHost/Join
2016-03-09 10:00:44 +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
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
d51bea798a
Merge remote-tracking branch 'origin/Render_Optimization' into RendererBugFixes
2016-03-08 16:20:23 +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
Jace
5d53fc74cb
Merge branch 'Dirtybit' of github.com:teamfisk/TacticalZ into Dirtybit
2016-03-08 15:46:21 +01:00
Jace
ecc8d998cf
Added ComponentInfo::Field_t::Index
2016-03-08 15:46:14 +01:00
e3c0fb2178
Added SetDirty function.
2016-03-08 15:44:02 +01:00
090bd806ce
Added DirtyBit enum to Dirty getter in ComponentWrapper.
2016-03-08 15:39:16 +01:00
3828616b60
Made it easier to maintain changes in packet header, prepared for reliable UDP packets.
2016-03-08 14:44:35 +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
f77a610519
Dash now looking good
2016-03-08 13:26:01 +01:00
0e0a486c01
AmmoPickupSystem should now be able to give ammo to all classtypes
2016-03-08 11:48:54 +01:00
9cbc582be2
Kinda works like before
2016-03-08 11:29:47 +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
e902110d4b
Commiting the files since they didn't get commited
2016-03-08 11:16:56 +01:00
01f29b6d4e
Blur behind buttons/sprites should now be working as intended.
2016-03-08 11:14:09 +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
6b7f598c4d
WIP
2016-03-07 23:35:58 +01:00
5c0d9070c7
WIP
2016-03-07 23:25:06 +01:00
e494f6a495
Merge branch 'master' into Shadows
2016-03-07 19:46:04 +01:00
2049d630e9
Revert "Revert "Shadows""
...
This reverts commit 73b8bff1f3
2016-03-07 19:45:46 +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
fd994ca93d
Deleting texture thats getting rended too.
2016-03-07 17:52:47 +01:00
68a88ed756
We are now using udp again
2016-03-07 16:07:54 +01:00
ee99821164
Add reverse and scalar for ColorByDistance
2016-03-07 15:45:06 +01:00
Jace
stiffly
Tleety
William Moberg
FakeShemp
verysecrethero
Teejoon
Jocke
viktorljung