Commit Graph

231 Commits

Author SHA1 Message Date
Regalis
f8d2bb4e2a Merge branch 'master' of https://gitlab.com/poe.regalis/barotrauma 2016-11-16 17:37:43 +02:00
Regalis
5b99f9e35e Saving server info box & traitor settings 2016-11-16 17:36:38 +02:00
juanjp600
5922fc972d Merge branch 'master' of https://gitlab.com/poe.regalis/barotrauma 2016-11-15 22:26:46 -03:00
juanjp600
d2c17274fe GUI elements now respect render order + some minor distance comparison optimization 2016-11-15 22:26:36 -03:00
Regalis
dd5eb69875 Fixed respawned characters getting a different team ID than the rest of the characters (causing them to be displayed as a separate team in the crew menu) 2016-11-14 20:09:37 +02:00
Regalis
8a8b9ca0fc Re-registering to master server if the server has timed out 2016-11-10 19:44:19 +02:00
Regalis
fa6bf60032 Combat missions don't reset the "allow respawn" setting 2016-11-06 15:57:28 +02:00
Regalis
8f646a2723 - fixed dummy location generation crashing the tutorial
- gameserver handles exceptions thrown when instantiating a new gamesession
- fixed screwdrivers (and other items that can be held in either hand) going into both hand slots when equipping by double clicking
2016-11-03 18:22:45 +02:00
Regalis
8011aecb31 Autorestart countdown is reset and the start button re-enabled if an exception is thrown when starting a new round, "restarting in X seconds" clamped over 0, added resolution & window mode to crash reports 2016-11-02 18:00:37 +02:00
Regalis
eb2c51c2f1 Cleanup with resharper (mostly removing redundancies & using collection.Length/Count properties instead of the Count method) 2016-10-31 20:50:20 +02:00
Regalis
5cc605bc01 Dust particles are drawn in the same batch as the background sprites (-> far-away particles are rendered behind the sprites), limiting character name length in the crew info menu, the "submarine not found in your folder" -tooltip is updated after downloading a sub file 2016-10-29 15:38:40 +03:00
Regalis
980f8e0d33 - option to select which location autopilot navigates towards
- generating "dummy locations" for the MP gamesessions (visible in sonar and mission descriptions)
- EndGame network message tells the clients if the mission was successful (because the message may arrive before the sub has reached the exit or before some character has died at the client's end)
2016-10-26 19:22:40 +03:00
Regalis
07f8c966ab Submarine position is synced using the same logic as the characters, AICharacter position syncing 2016-10-25 19:01:19 +03:00
Regalis
ac8edb5b2a Fixed monster/artifact events being out of sync between the server and the clients 2016-10-25 18:58:56 +03:00
Regalis
641e579e92 Backported animcontroller-overhaul 2016-10-22 15:18:16 +03:00
juanjp600
cb1b975f9f Merged branch combat-mission into combat-mission 2016-10-10 09:58:06 -03:00
juanjp600
0125ff0f5c Replace mission GUI box text hack + If both teams die, they both lose 2016-10-10 08:32:31 -03:00
Regalis
f7e98ee6a8 Cargo spawning fix again: items are spawned slightly above the bottom of the cargo room (because the item is only inside the hull if pos.Y > hull.rect.bottom) 2016-10-09 17:33:51 +03:00
juanjp600
b09eebc9c2 Holding F gives old mousewheel zoom functionality 2016-10-08 18:55:27 -03:00
Regalis
1b66e51970 Additional cargo isn't spawned in shuttles, fixed exception if trying to spawn additional cargo in a sub with no cargo spawnpoint, netlobby chatMsgBox stays selected after sending a chat message 2016-10-08 18:02:25 +03:00
juanjp600
91539c5b84 Host can spawn in team 2 + relay component state syncing 2016-10-05 22:03:06 -03:00
juanjp600
ffeda27c1b Restored change lost in conflict resolve
Also checking for itemprefab because adding structures wouldn't make any sense here
2016-10-05 17:01:38 -03:00
Regalis
4ebe961024 Simpler method of checking which items to put in the Additional Cargo menu 2016-10-05 20:19:09 +03:00
Regalis
fb28fc8cda - separate listboxes for both teams in the crew menu
- fixed host getting team ID 0
- fixed clients not spawning if their ID is 0 (= if playing a non-combat mission before IDs have been assigned)
- fixed host's character taking part in the job assignment of both teams
2016-10-05 20:15:39 +03:00
Regalis
41c38575b9 Using ItemSpawner to spawn extra cargo (-> clients will be notified of the spawned items) 2016-10-05 18:30:48 +03:00
juanjp600
14ae355f19 Merge remote-tracking branch 'refs/remotes/barotrauma/combat-mission'
Conflicts:
	Subsurface/Source/GUI/GUIListBox.cs
2016-10-04 22:30:29 -03:00
juanjp600
4874ad2ef8 Host can have subs spawn with more items
TODO: check if clients see the extra cargo, they probably don't
2016-10-04 22:28:13 -03:00
Regalis
ffc6782025 Removed fixed timestep logic from GameScreen (redundant now because the logic is handled in GameMain) 2016-10-04 19:54:17 +03:00
Regalis
41289c098a Moved some UI element updates from draw to update 2016-10-04 18:28:56 +03:00
juanjp600
1187686449 Host can disable spawning of certain characters
GUITickBox might not work very well because of the override of Rect, might want to look into that later
2016-10-03 22:27:32 -03:00
juanjp600
e1296e4a8e Backported vsync changes from new-netcode, WIP hull visibility culling
The hull culling functions are there, they just aren't being used right now because there are some annoying bugs.
2016-10-02 22:24:31 -03:00
juanjp600
f6b82eb095 Some progress on flipping subs
Press crouch to flip every sub in the map, texture alignment breaks and physics items vanish, but other than that it's working.
2016-09-29 22:20:15 -03:00
Regalis
4e9ea758cb Team IDs start from 1 (-> monsters don't count as members of the team 0) 2016-09-27 17:55:45 +03:00
Regalis
8f0d16b145 Fixed host's character spawning twice, some cleanup (LINQ <3) 2016-09-27 17:31:26 +03:00
juanjp600
344947c3c4 Search and destroy mission
Featuring ugly code
2016-09-26 22:09:06 -03:00
juanjp600
d537e8795a Replace '' (two single quotes) with \" (double quote)
We must correct post-traumatic Blitz disorder
2016-09-24 21:26:08 -03:00
Regalis
d884f23a72 v5.1.3: the upper border of the level is one continuous body instead of two separate bodies at the entrance and exit 2016-09-07 15:18:01 +03:00
Regalis
53b3ef533e Moved the whitelist UI to server settings, GUITextBoxes can't be selected through other UI elements anymore 2016-09-05 18:12:56 +03:00
juanjp600
ef49a946c9 Fixed whitelist crashing server init when not enabled in file 2016-09-03 21:38:02 -03:00
juanjp600
73bdd77c08 The same name can be added more than once to whitelist 2016-09-03 19:00:07 -03:00
juanjp600
d0efbe14f3 Whitelist saving 2016-09-03 17:51:10 -03:00
juanjp600
efa8b4da51 Removed per-user password from whitelist 2016-09-03 17:18:44 -03:00
juanjp600
ef2b0d8721 Whitelist + conflict resolve 2016-09-03 14:57:36 -03:00
juanjp600
9c116fc268 Merged branch master into master 2016-08-30 17:36:11 -03:00
juanjp600
52270e3a35 Hacked clients can't send chat messages from other characters anymore
Also added sendername as userdata in chat messages, for now it's not used for anything but we'll probably find something where this is useful
2016-08-30 17:35:58 -03:00
Regalis
2e2043bf7f Chat messages are added to the server log even if the host's character is out of range, message senders are shown in the server log, fixed multi-line log entries overlapping 2016-08-30 19:06:15 +03:00
juanjp600
6bb6f63dd7 Hacked clients can't change their character name
Also made spam filter's aggressiveness consistent
2016-08-29 19:45:21 -03:00
juanjp600
df0b064899 Hacked client can't join full server anymore
Not sure how they can get around lidgren's checking, but this should do the trick
2016-08-29 19:02:37 -03:00
juanjp600
83f8ad0555 Clientside fix for empty password
Thanks for finding this Reg
2016-08-29 18:40:27 -03:00
juanjp600
bf686ae997 A few more security checks 2016-08-29 18:38:06 -03:00