Regalis 31f7eca717 Merge branch 'master' into new-netcode ...

Conflicts:
	Subsurface/Source/GUI/GUIButton.cs
	Subsurface/Source/GameSession/CrewManager.cs
	Subsurface/Source/GameSession/GameSession.cs
	Subsurface/Source/Items/Item.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Screens/MainMenuScreen.cs
	Subsurface/Source/Screens/ServerListScreen.cs

2017-04-23 21:40:11 +03:00

..

Controller.cs

Merge branch 'master' into new-netcode

2017-02-22 23:33:14 +02:00

Deconstructor.cs

Merge branch 'master' into new-netcode

2017-04-23 21:40:11 +03:00

Engine.cs

Merge branch 'master' into new-netcode

2017-04-23 21:40:11 +03:00

Fabricator.cs

Merge branch 'master' into new-netcode

2017-04-23 21:40:11 +03:00

MiniMap.cs

Removed a redundant DrawRectangle method & redundant sub visibility culling in GameScreen

2016-11-12 18:29:39 +02:00

OxygenGenerator.cs

Fixed vents, more powerful oxygen generators in vanilla subs

2016-05-30 18:25:50 +03:00

Pump.cs

Merge branch 'master' into new-netcode

2017-04-23 21:40:11 +03:00

Radar.cs

Merge branch 'master' into new-netcode

2017-04-23 21:40:11 +03:00

Reactor.cs

Merge branch 'master' into new-netcode

2017-04-23 21:40:11 +03:00

Steering.cs

Reactors, sonars, nav terminals, pumps and batteries use similar delayed correction logic as doors and inventories.

2017-04-11 00:48:53 +03:00

Vent.cs

Possible to zoom out further when debugdraw is on, vents don't replenish oxygen when underwater, monster missions & events ignore spawnpoints that are too close to the main sub

2016-09-14 20:25:09 +03:00