Commit Graph

286 Commits

Author SHA1 Message Date
juanjp600 91539c5b84 Host can spawn in team 2 + relay component state syncing 2016-10-05 22:03:06 -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 65006c5da1 Fixed exception when attempting to start a round with no clients, spawning host's character 2016-10-04 19:22:23 +03:00
Regalis 050f7ffc83 Removed fixed timestep logic from GameScreen (redundant now because the logic is handled in GameMain) 2016-10-04 19:21:05 +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
Regalis bc5ace4f53 Clients spawn all characters at round start (not just their own), spawnpoints that aren't inside the main sub are ignored when selecting spawnpoints for the clients 2016-09-26 20:02:23 +03:00
Regalis c402ba208b Spawning client characters with correct characterinfo 2016-09-26 17:06:20 +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 5567dff1c9 Fixed input order execution + Controller direction syncing
It was a dumb mistake indeed, now the player's movement is a lot less erratic. There's some very minor desync, though I might've just tested it incorrectly.
2016-09-24 18:11:09 -03:00
juanjp600 44e12ffed2 Basic player input syncing
There's currently a bug where the inputs might be read out of order or more than once, which leads to desync. I'll feel really dumb when I find what's going on here.

Also, I'm using placeholder player spawning because CharacterInfo doesn't seem to be fully functional yet.
2016-09-22 21:20:46 -03:00
Regalis 4fbb83e2e7 The server can start the game 2016-09-09 19:49:13 +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 ccf6e6d544 Syncing game mode, mission type, traitor setting, level seed & autorestart 2016-09-07 19:17:31 +03:00
juanjp600 a02931054a Sync sub selection 2016-09-05 17:15:41 -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 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 ef2b0d8721 Whitelist + conflict resolve 2016-09-03 14:57:36 -03:00
juanjp600 4b10ca21c4 Ban before disconnecting client 2016-09-02 22:49:40 -03:00
juanjp600 e3433c725e Server name, message and submarine list syncing 2016-09-02 22:24:14 -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 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 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
juanjp600 55a2db7c70 Removed more networking code 2016-08-30 21:33:10 -03:00
juanjp600 7bdcc51bae Made game compilable
Networking functionality is fully disabled now.

I think it's time to start rewriting everything. OH BOY
2016-08-30 21:13:36 -03:00
juanjp600 0a0f8e19b4 Merged branch new-netcode into new-netcode 2016-08-30 20:37:12 -03:00
juanjp600 9416eb64d7 Completely destroyed game
Looks like a lot more than just netcode is getting rewritten. Removing coroutines because there are better ways of handling asynchronous tasks, removing filestream because that's to be reimplemented later
2016-08-30 19:59:14 -03:00
juanjp600 37ffd64490 Disabled networkevent
Changing the way each item handles its own network updating
2016-08-30 19:28:32 -03:00
juanjp600 6e83ef7626 Merge remote-tracking branch 'refs/remotes/origin/master'
Conflicts:
	Subsurface/Barotrauma.csproj
	Subsurface/Source/Characters/AI/EnemyAIController.cs
	Subsurface/Source/Characters/AICharacter.cs
	Subsurface/Source/Characters/Character.cs
	Subsurface/Source/Items/Components/DockingPort.cs
	Subsurface/Source/Items/Components/Door.cs
	Subsurface/Source/Items/Item.cs
	Subsurface/Source/Networking/GameClient.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Physics/PhysicsBody.cs
2016-08-30 18:04:49 -03:00