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

..

Characters

Merge branch 'master' into new-netcode

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

EventInput

v0.5.3.3

2016-11-09 21:01:38 +02:00

Events

- changed how PowerContainers determine how much power to provide to the grid, batteries can now match the load of the grid

2016-11-21 16:28:30 +02:00

GameSession

Merge branch 'master' into new-netcode

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

GUI

Merge branch 'master' into new-netcode

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

Items

Merge branch 'master' into new-netcode

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

Map

Merge branch 'master' into new-netcode

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

Networking

Merge branch 'master' into new-netcode

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

Particles

Handling exceptions in particle update, gamesession UI order fix, traitor setting loading fix

2016-11-16 20:14:14 +02:00

Physics

Merge branch 'master' into new-netcode

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

Screens

Merge branch 'master' into new-netcode

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

Sounds

Hull volume helper in editor + Character name matches client name + Better-looking Watcher light source

2016-11-20 18:47:22 -03:00

Utils

Hull volume helper in editor + Character name matches client name + Better-looking Watcher light source

2016-11-20 18:47:22 -03:00

Camera.cs

Holding F gives old mousewheel zoom functionality

2016-10-08 18:55:27 -03:00

ContentPackage.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

CoroutineManager.cs

Search and destroy mission

2016-09-26 22:09:06 -03:00

DebugConsole.cs

Merge branch 'master' into new-netcode

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

FrameCounter.cs

Switch to Barotrauma & too many misc changes to remember

2015-10-16 18:11:58 +03:00

GameMain.cs

Merge branch 'master' into new-netcode

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

GameSettings.cs

Merge remote-tracking branch 'barotrauma/master' into new-netcode

2016-11-05 18:18:20 -03:00

IPropertyObject.cs

Switch to Barotrauma & too many misc changes to remember

2015-10-16 18:11:58 +03:00

PlayerInput.cs

Character freezing + Misc fixes

2016-09-21 16:46:12 -03:00

Program.cs

Limiting character movement when collider isn't upright (can't run at full speed if lodged in some tight space), hack-ish way of moving the collider of a character that's being dragged

2016-11-07 18:52:36 +02:00

Properties.cs

Replace '' (two single quotes) with \" (double quote)

2016-09-24 21:26:08 -03:00

Sprite.cs

v0.5.3.3

2016-11-09 21:01:38 +02:00

Timing.cs

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

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