Commit Graph

532 Commits

Author SHA1 Message Date
Regalis
4fbb83e2e7 The server can start the game 2016-09-09 19:49:13 +03:00
juanjp600
4763dac21b Merged branch master into new-netcode 2016-09-08 15:34:40 -03:00
Regalis
1f7bf250b5 asdfasdf 2016-09-08 21:26:15 +03:00
Regalis
93a3a55fb1 Oxygen isn't distributed through gaps that are underwater (-> air pockets) 2016-09-08 21:23:44 +03:00
Regalis
4bf01aeba7 Improved MiniMap: shows hull integrity and oxygen levels, and can be configured to only show oxy/water data if the rooms have detectors in place
+ itemprefab "aliases" (allows changing item names while keeping backwards compatibility with older sub files)
2016-09-08 20:21:55 +03:00
Regalis
7be5474617 Autopilot tweaking 2016-09-08 20:14:57 +03:00
juanjp600
1b85dc3646 Fixed lobby chat 2016-09-08 09:43:44 -03:00
juanjp600
7c9ae5134c Move chat message serialization to the ChatMessage class 2016-09-07 21:41:59 -03:00
juanjp600
404c506662 Merge remote-tracking branch 'refs/remotes/barotrauma/master'
Conflicts:
	Subsurface/Properties/AssemblyInfo.cs
	Subsurface/Source/Characters/Character.cs
2016-09-07 17:35:18 -03:00
juanjp600
ba388ae298 Merge remote-tracking branch 'refs/remotes/barotrauma/new-netcode'
Conflicts:
	Subsurface/Source/Networking/GameServer.cs
2016-09-07 17:33:45 -03:00
juanjp600
bfd8bc6b35 Server serialization functions require client 2016-09-07 17:32:20 -03:00
Regalis
94cec67a2b Characters that aren't inside a hull or can't enter subs won't attempt to play a walking animation 2016-09-07 20:18:52 +03:00
Regalis
ba77ed717a Fixed the previous commit (clients don't increment lastUpdateID when changing values in the lobby) 2016-09-07 19:59:33 +03:00
Regalis
ccf6e6d544 Syncing game mode, mission type, traitor setting, level seed & autorestart 2016-09-07 19:17:31 +03:00
Regalis
9463b18993 Huskification bugfixes 2016-09-07 18:19:42 +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
e61e40547b Improved autopilot 2016-09-06 19:14:27 +03:00
juanjp600
a02931054a Sync sub selection 2016-09-05 17:15:41 -03:00
juanjp600
95118ed6ab Merge remote-tracking branch 'refs/remotes/barotrauma/master'
Conflicts:
	Subsurface/Barotrauma.csproj
2016-09-05 13:28:21 -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
Regalis
98b04f1147 Merge branch 'master' of https://gitlab.com/poe.regalis/barotrauma
Conflicts:
	Subsurface/Barotrauma.csproj
2016-09-04 19:24:00 +03:00
Regalis
3b394976e4 A new monster, some changes to fish animation logic (creatures don't need to have a head, more pronounced swimming movement, option to select the position where steering forces are applied) 2016-09-04 19:18:44 +03:00
juanjp600
bbc4a53e78 Merged branch master into new-netcode 2016-09-03 21:39:03 -03:00
juanjp600
ef49a946c9 Fixed whitelist crashing server init when not enabled in file 2016-09-03 21:38:02 -03:00
juanjp600
2ec26d783c Merged branch master into new-netcode 2016-09-03 19:00:40 -03:00
juanjp600
73bdd77c08 The same name can be added more than once to whitelist 2016-09-03 19:00:07 -03:00
juanjp600
2116a1a93a Fixed rangeban 2016-09-03 18:15:36 -03:00
juanjp600
6f25bee9e1 Merge remote-tracking branch 'refs/remotes/barotrauma/master'
Conflicts:
	.vs/Subsurface_Solution/v14/.suo
	Subsurface/Barotrauma.csproj
	Subsurface/Properties/AssemblyInfo.cs
	Subsurface/Source/Items/ItemSpawner.cs
	Subsurface/Source/Networking/GameClient.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Networking/GameServerLogin.cs
2016-09-03 17:54:33 -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
Sebastian Broberg
400084f9e5 BackgroundCreatureManager and BackgroundSpriteManager can be overridden via Content packages
Changed "topshaft"
2016-09-03 18:05:26 +02:00
juanjp600
4b10ca21c4 Ban before disconnecting client 2016-09-02 22:49:40 -03:00
juanjp600
03948d5f58 Merged branch new-netcode into new-netcode 2016-09-02 22:25:01 -03:00
juanjp600
e3433c725e Server name, message and submarine list syncing 2016-09-02 22:24:14 -03:00
Regalis
cf77a59c97 Implemented some of the itemcomponent read/write methods, made submarines server serializable 2016-09-02 17:59:08 +03:00
juanjp600
e0b6642767 Minor fixes and tweaks 2016-09-01 22:22:45 -03:00
juanjp600
51dd858af1 Client reads lobby chat from server 2016-09-01 22:05:13 -03:00
juanjp600
028c3a8bc1 Added lobby chat syncing 2016-09-01 20:45:43 -03:00
juanjp600
fc457e0f18 Detect disconnect while password box is open 2016-09-01 15:43:27 -03:00
Regalis
0d68467464 Separate interfaces for entities that the clients/server can send updates for (+ placeholder implementations)
May or may not be useful
2016-09-01 20:39:52 +03:00
juanjp600
f845a21de8 Fixed login process
Time to get the lobby working
2016-09-01 13:45:46 -03:00
juanjp600
104ac73b97 Added login process to client
Doesn't work yet, gotta figure this out.
2016-09-01 11:42:21 -03:00
juanjp600
db0d4b1cd6 Fixed server kicking clients who request auth after validation 2016-08-31 21:11:27 -03:00
juanjp600
795efd82ab Added missing auth response header 2016-08-31 19:44:29 -03:00
juanjp600
a4a6046013 Fix banned packets being read 2016-08-31 18:49:51 -03:00
juanjp600
f5bd5fe0d3 Extra ban check for data packet type 2016-08-31 18:48:45 -03:00
juanjp600
f3b826a371 Added new function calls in server ReadMessage loop 2016-08-31 18:47:16 -03:00
juanjp600
b9a246ca68 New login process + a little bit of cleanup
No reliability required :) Will get to the client soon
2016-08-31 18:26:17 -03:00
Regalis
2c51ba50a8 v0.5.1.2: spawnitem console command, "spawn inside" always spawns characters in the main sub, a new music clip, modified the topwindow sprite a bit 2016-08-31 22:06:05 +03:00