67ccb5bee5
Merge remote-tracking branch 'origin/master' into FriendlyHost/Join
2016-03-09 13:23:31 +01:00
31ed606ef9
Merge pull request #183 from teamfisk/Menu
...
Menu
2016-03-09 12:33:36 +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
b782e73556
Falsified DepthSort for SpectatorCamera buttons and CP-HUD elements.
2016-03-09 10:56:05 +01:00
c1f38a71ba
Merge remote-tracking branch 'origin/master' into FriendlyHost/Join
2016-03-09 10:12:57 +01:00
d7c30450dc
Should now read servername from config.
2016-03-09 10:08:23 +01:00
30e1c2c247
Merge pull request #178 from teamfisk/NetworkComponent
...
Network component
2016-03-09 10:04:40 +01:00
4abe73eae7
Merge remote-tracking branch 'origin/master' into FriendlyHost/Join
2016-03-09 10:00:44 +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
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
e5dba6604b
Merge pull request #181 from teamfisk/AmmoPickup
...
AmmoPickupSystem should now be able to give ammo to all classtypes
2016-03-08 17:09:37 +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
a0ca4df3be
Some server list components and entities.
2016-03-08 13:29:21 +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
68b0175b3d
Merge remote-tracking branch 'origin/master' into AmmoPickup
2016-03-08 11:54:57 +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
3436ba6656
Merge pull request #177 from teamfisk/AmmoPickup
...
Fixed some systems added twice in Game.cpp
2016-03-08 09:46:36 +01:00
6b7f598c4d
WIP
2016-03-07 23:35:58 +01:00
5c0d9070c7
WIP
2016-03-07 23:25:06 +01:00
fcf87104c3
Replaced test textures for class picking with more proper icons.
2016-03-07 17:50:03 +01:00
1516ed8e2d
Removed debug logging. PlayerID in InputCommands from buttons is corrected.
2016-03-07 17:35:01 +01:00
9e8df340b3
Merge remote-tracking branch 'origin/master' into NetworkComponent
...
# Conflicts:
# src/Engine/Network/Server.cpp
2016-03-07 17:21:24 +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
b629ed5e2b
Updated some known xml entities that should be send in snapshots.
2016-03-07 17:15:56 +01:00
f00fb836fb
Oops.
2016-03-07 17:10:13 +01:00
13c3bcb290
Now only entities with NetworkComponent will be send in Snapshots.
2016-03-07 16:52:51 +01:00
7de95d4cb5
Mainmenu entity
2016-03-07 16:34:56 +01:00
f585f9ada9
Created the NetworkComponent xml file
2016-03-07 16:11:19 +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
9c3fa25834
Merge pull request #176 from teamfisk/PlayerHUD
...
Player hud
2016-03-07 15:14:37 +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
3eaad275ba
New CapturePointAddition fixed to work on Network by Joachim
2016-03-07 14:50:31 +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
stiffly
Tleety
William Moberg
verysecrethero