Commit Graph

14 Commits

Author SHA1 Message Date
juanjp600
02d98f5d29 Merge remote-tracking branch 'refs/remotes/barotrauma/master'
Conflicts:
	Subsurface/Source/Networking/FileStreamReceiver.cs
	Subsurface/Source/Networking/FileStreamSender.cs
	Subsurface/Source/Networking/GameClient.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Networking/GameServerLogin.cs
	Subsurface/Source/Networking/NetworkEvent.cs
	Subsurface/Source/Screens/NetLobbyScreen.cs
2016-09-24 21:28:37 -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
juanjp600
d561805010 More netcode cleanup
how much more is there :/
2016-08-30 21:35:05 -03:00
juanjp600
33dc22da05 Merge remote-tracking branch 'refs/remotes/origin/new-netcode'
Conflicts:
	Subsurface/Source/Networking/GameClient.cs
2016-08-30 21:34:11 -03:00
juanjp600
55a2db7c70 Removed more networking code 2016-08-30 21:33:10 -03:00
juanjp600
2b110588b8 Removed more networking code 2016-08-30 21:30:31 -03:00
Regalis
9689ef070d Vote kick settings 2016-06-07 14:13:12 +03:00
Regalis
0e24eab5e3 Re-enabled vote kicking, with some improvements: chat messages notifying about votes, kick button is disabled for the host's character or if already voted 2016-06-03 15:00:36 +03:00
Regalis
310e85fd8c WIP kicking by voting 2016-05-26 16:05:45 +03:00
Regalis
9f8f4e290e Fixed propulsion applying force to _every limb except_ the ones it's supposed to, fixed pressure building up in enclosed rooms that are full of water, fixed netlobby displaying multiple votes for clients, progress on file transfer 2016-02-26 22:21:00 +02:00
Regalis
1506738ff7 Voting bugfixes 2016-02-12 23:41:28 +02:00
Regalis
c6f52cc68f Voting for round to end, level generation improvements 2016-02-12 19:39:24 +02:00
Regalis
4d949e3be1 Spectating, fire, damaged limb sprites, water detector, engineer jumpsuit, new signal comp sprites, resharper cleanup (god knows what else, commit more often) 2015-11-10 22:22:26 +02:00
Regalis
bcc96cee97 Infinite wall fixes, pressure damage to sub, sub/mode voting & randomization working now, better ui scaling 2015-10-31 00:29:51 +02:00