Regalis ac65a431a8 Merge branch 'master' into new-netcode ...

Conflicts:
	Subsurface/Properties/AssemblyInfo.cs
	Subsurface/Source/Items/Components/Signal/Wire.cs
	Subsurface/Source/Items/Item.cs
	Subsurface/Source/Items/ItemInventory.cs
	Subsurface/Source/Networking/GameServer.cs

2016-11-09 17:58:56 +02:00

..

Physics.cs

Backported animcontroller-overhaul

2016-10-22 15:18:16 +03:00

PhysicsBody.cs

Merge branch 'master' into new-netcode

2016-11-09 17:58:56 +02:00