juanjp600 6e83ef7626 Merge remote-tracking branch 'refs/remotes/origin/master' ...

Conflicts:
	Subsurface/Barotrauma.csproj
	Subsurface/Source/Characters/AI/EnemyAIController.cs
	Subsurface/Source/Characters/AICharacter.cs
	Subsurface/Source/Characters/Character.cs
	Subsurface/Source/Items/Components/DockingPort.cs
	Subsurface/Source/Items/Components/Door.cs
	Subsurface/Source/Items/Item.cs
	Subsurface/Source/Networking/GameClient.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Physics/PhysicsBody.cs

2016-08-30 18:04:49 -03:00

..

Components

Removed Fill/ReadNetworkData

2016-08-29 20:02:46 -03:00

CharacterInventory.cs

Removed Fill/ReadNetworkData

2016-08-29 20:02:46 -03:00

FixRequirement.cs

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

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

Inventory.cs

Removed Fill/ReadNetworkData

2016-08-29 20:02:46 -03:00

Item.cs

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

2016-08-30 18:04:49 -03:00

ItemInventory.cs

- converting NetworkEvent sending time to local time before doing any comparisons

2016-03-03 21:11:54 +02:00

ItemPrefab.cs

Cargo spawns at the floor of the cargo room, item configs are fetched from the prefab instead of reloading the config files every time when placing an item

2016-07-16 16:12:34 +03:00

ItemSpawner.cs

Removed Fill/ReadNetworkData

2016-08-29 20:02:46 -03:00

RelatedItem.cs

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

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