vlad.os/LuaCsForBarotraumaEP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
754 Commits 5 Branches 2 Tags
ac3539da63247b871303da9af963e095949e8421
Commit Graph

263 Commits

Author SHA1 Message Date
Regalis
ac3539da63 Item spawn syncing 2016-10-12 18:29:44 +03:00
Regalis
a235b90aee Job & waypoint assignment 2016-10-12 16:49:43 +03:00
juanjp600
f5268c7c6c Fixes 
It compiles now, but it's probably really broken.
 2016-10-11 21:37:23 -03:00
juanjp600
72033a581e Merge remote-tracking branch 'refs/remotes/barotrauma/master' 
Conflicts:
	Subsurface/Properties/AssemblyInfo.cs
	Subsurface/Source/Characters/Character.cs
	Subsurface/Source/GUI/GUI.cs
	Subsurface/Source/GameMain.cs
	Subsurface/Source/GameSettings.cs
	Subsurface/Source/Items/CharacterInventory.cs
	Subsurface/Source/Items/Components/ItemComponent.cs
	Subsurface/Source/Items/Components/Machines/Pump.cs
	Subsurface/Source/Items/Components/Machines/Radar.cs
	Subsurface/Source/Items/Components/Machines/Steering.cs
	Subsurface/Source/Items/Components/Power/PowerContainer.cs
	Subsurface/Source/Items/Inventory.cs
	Subsurface/Source/Items/Item.cs
	Subsurface/Source/Items/ItemSpawner.cs
	Subsurface/Source/Map/Levels/WaterRenderer.cs
	Subsurface/Source/Map/LinkedSubmarine.cs
	Subsurface/Source/Map/Map/Map.cs
	Subsurface/Source/Map/Structure.cs
	Subsurface/Source/Map/Submarine.cs
	Subsurface/Source/Map/WayPoint.cs
	Subsurface/Source/Networking/GameClient.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Physics/PhysicsBody.cs
	Subsurface/Source/Screens/GameScreen.cs
 2016-10-11 20:19:25 -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
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
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
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
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
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
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