Regalis 095054182e Merge branch 'master' into new-netcode ...

Conflicts:
	Subsurface/Source/GUI/GUITextBlock.cs
	Subsurface/Source/GameMain.cs
	Subsurface/Source/Items/Components/Machines/Radar.cs
	Subsurface/Source/Networking/GameClient.cs

2017-05-17 18:51:22 +03:00

..

Components

Merge branch 'master' into new-netcode

2017-05-17 18:51:22 +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

Serverlog message types (which atm only determine the color of the message)

2017-05-09 19:56:12 +03:00

Item.cs

Fixed clients being unable to toggle doors when they've predicted the state of the door and waiting for a confirmation from the server, reading a position update for an item with no body doesn't throw an exception

2017-05-10 21:19:10 +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