Regalis 31f7eca717 Merge branch 'master' into new-netcode ...

Conflicts:
	Subsurface/Source/GUI/GUIButton.cs
	Subsurface/Source/GameSession/CrewManager.cs
	Subsurface/Source/GameSession/GameSession.cs
	Subsurface/Source/Items/Item.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Screens/MainMenuScreen.cs
	Subsurface/Source/Screens/ServerListScreen.cs

2017-04-23 21:40:11 +03:00

..

Holdable

Logging when clients use an item on themselves or hit someone with a melee weapon

2017-04-17 19:52:25 +03:00

Machines

Merge branch 'master' into new-netcode

2017-04-23 21:40:11 +03:00

Power

Merge branch 'master' into new-netcode

2017-04-23 21:40:11 +03:00

Signal

ItemComponent syncing fixes:

2017-04-11 20:38:07 +03:00

DockingPort.cs

- DockingPort syncing fix: server waits until the port is locked before sending hull/gap IDs, clients can't lock the port until the server tells them to

2017-04-09 20:51:57 +03:00

Door.cs

ItemComponent syncing fixes:

2017-04-11 20:38:07 +03:00

ItemComponent.cs

Merge branch 'master' into new-netcode

2017-04-23 21:40:11 +03:00

ItemContainer.cs

Fixed ItemContainer not setting the position of a contained item when it's placed in the ItemInventory, minor refactoring

2017-02-07 21:06:42 +02:00

ItemLabel.cs

Text scale in GUITextBlocks and ItemLabels can be changed, text wrapping fix (words that are too wide for one line shouldn't cause overflows anymore)

2017-03-22 23:22:54 +02: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

- Fixed railgun sounds not playing at the clients' end

2017-04-10 20:13:33 +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