juanjp600 404c506662 Merge remote-tracking branch 'refs/remotes/barotrauma/master' ...

Conflicts:
	Subsurface/Properties/AssemblyInfo.cs
	Subsurface/Source/Characters/Character.cs

2016-09-07 17:35:18 -03:00

..

Components

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

2016-09-07 17:35:18 -03:00

CharacterInventory.cs

Made game compilable

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

FixRequirement.cs

Completely destroyed game

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

Inventory.cs

Made game compilable

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

Item.cs

Server serialization functions require client

2016-09-07 17:32:20 -03:00

ItemInventory.cs

Completely destroyed game

2016-08-30 19:59:14 -03: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

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