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

..

Components

Merge remote-tracking branch 'refs/remotes/barotrauma/master'

2016-09-24 21:28:37 -03:00

CharacterInventory.cs

Made game compilable

2016-08-30 21:13:36 -03:00

FixRequirement.cs

Fixed timestep for some GUI & input code

2016-09-18 11:03:52 -03:00

Inventory.cs

Made game compilable

2016-08-30 21:13:36 -03:00

Item.cs

Fixed timestep for some GUI & input code

2016-09-18 11:03:52 -03:00

ItemInventory.cs

Completely destroyed game

2016-08-30 19:59:14 -03:00

ItemPrefab.cs

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

2016-09-08 20:21:55 +03:00

ItemSpawner.cs

Merge remote-tracking branch 'refs/remotes/barotrauma/master'

2016-09-03 17:54:33 -03:00

RelatedItem.cs

Using ToLowerInvariant instead of ToLower (the game works for Turkish players now!)

2016-04-27 17:14:09 +03:00