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

Conflicts:
	Subsurface/Properties/AssemblyInfo.cs
	Subsurface/Source/Characters/Animation/HumanoidAnimController.cs
	Subsurface/Source/Characters/Character.cs
	Subsurface/Source/Items/Components/Door.cs
	Subsurface/Source/Items/Components/Power/PowerContainer.cs
	Subsurface/Source/Items/Components/Signal/Wire.cs
	Subsurface/Source/Items/Item.cs
	Subsurface/Source/Networking/ChatMessage.cs
	Subsurface/Source/Networking/GameClient.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Networking/GameServerLogin.cs
	Subsurface/Source/Networking/GameServerSettings.cs
	Subsurface/Source/Networking/NetworkMember.cs

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

..

Holdable

Merge branch 'master' into new-netcode

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

Machines

Merge branch 'master' into new-netcode

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

Power

Merge branch 'master' into new-netcode

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

Signal

Merge branch 'master' into new-netcode

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

DockingPort.cs

Sending NetEntityEvents from client to server, ItemComponent class doesn't implement the INetSerializable interfaces (only the derived classes do), reactor syncing

2016-11-13 19:34:23 +02:00

Door.cs

Merge branch 'master' into new-netcode

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

ItemComponent.cs

Merge branch 'master' into new-netcode

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

ItemContainer.cs

Merge branch 'master' into new-netcode

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

ItemLabel.cs

Small optimization: items have a list of components that have to be drawn

2016-05-24 21:17:38 +03:00

Ladder.cs

Some cleanup using ReSharper (mostly removing redundancies)

2016-03-12 15:32:34 +02:00

Projectile.cs

Backported animcontroller-overhaul

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

Rope.cs

Cleanup with resharper (mostly removing redundancies & using collection.Length/Count properties instead of the Count method)

2016-10-31 20:50:20 +02:00

StatusHUD.cs

- health scanner item

2016-03-26 18:15:44 +02:00

Turret.cs

Flipping turrets & controllers, moved radar UI update to UpdateHUD

2016-10-05 16:54:05 +03:00

Wearable.cs

- ItemContainers whose bodies are disabled don't set the positions of the contained items each frame (only once when the item is placed in the container)

2016-11-08 21:22:09 +02:00