Regalis 1f07b18e5b Merge branch 'master' into new-netcode ...

Conflicts:
	Subsurface/Properties/AssemblyInfo.cs
	Subsurface/Source/Items/Components/DockingPort.cs
	Subsurface/Source/Items/Components/Signal/Wire.cs
	Subsurface/Source/Items/Item.cs

2016-12-29 22:18:27 +02:00

..

Components

Merge branch 'master' into new-netcode

2016-12-29 22:18:27 +02:00

CharacterInventory.cs

Inventory syncing, objHeader is passed to the ClientRead/ServerRead methods so they can determine how to read the msg (is it an inventory update, position, input, etc)

2016-12-10 16:39:58 +02:00

FixRequirement.cs

Merge branch 'master' into new-netcode

2016-11-24 19:52:40 +02:00

Inventory.cs

Inventory syncing, objHeader is passed to the ClientRead/ServerRead methods so they can determine how to read the msg (is it an inventory update, position, input, etc)

2016-12-10 16:39:58 +02:00

Item.cs

Merge branch 'master' into new-netcode

2016-12-29 22:18:27 +02:00

ItemInventory.cs

Inventory syncing, objHeader is passed to the ClientRead/ServerRead methods so they can determine how to read the msg (is it an inventory update, position, input, etc)

2016-12-10 16:39:58 +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