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

..

Components

Merge branch 'master' into new-netcode

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

CharacterInventory.cs

Merge branch 'master' into new-netcode

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

FixRequirement.cs

Merge branch 'master' into new-netcode

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

Inventory.cs

Merge branch 'master' into new-netcode

2017-03-11 13:24:09 +02:00

Item.cs

Merge branch 'master' into new-netcode

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

ItemInventory.cs

Fixed ItemContainer not setting the position of a contained item when it's placed in the ItemInventory, minor refactoring

2017-02-07 21:06:42 +02:00

ItemPrefab.cs

Fixes and minor enhancements for sub editor

2016-10-06 21:15:01 -03:00

RelatedItem.cs

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

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