Regalis 62dd055e8d Merge branch 'master' into animcontroller-overhaul ...

Conflicts:
	Subsurface/Content/Characters/Crawler/crawler.xml
	Subsurface/Source/Characters/AICharacter.cs
	Subsurface/Source/Characters/Animation/FishAnimController.cs
	Subsurface/Source/Characters/Animation/Ragdoll.cs
	Subsurface/Source/Characters/Character.cs
	Subsurface/Source/Map/Submarine.cs
	Subsurface/Source/Map/SubmarineBody.cs
	Subsurface/Source/Networking/GameClient.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Physics/PhysicsBody.cs

2016-10-25 20:09:25 +03:00

..

Components

Merge branch 'master' into animcontroller-overhaul

2016-10-25 20:09:25 +03:00

CharacterInventory.cs

Merge branch 'master' into animcontroller-overhaul

2016-10-22 13:38:25 +03:00

FixRequirement.cs

Removed fixed timestep logic from GameScreen (redundant now because the logic is handled in GameMain)

2016-10-04 19:54:17 +03:00

Inventory.cs

Merge branch 'master' into new-netcode

2016-10-12 21:12:21 +03:00

Item.cs

Merge branch 'master' into animcontroller-overhaul

2016-10-19 21:15:44 +03:00

ItemInventory.cs

Completely destroyed game

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