Regalis 3e5f8a43a0 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-24 19:10:51 +03:00

..

Characters

Merge branch 'master' into new-netcode

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

EventInput

v0.5.3.3

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

Events

Sync monster spawn settings

2017-04-06 16:50:11 -03:00

Fonts

Fixed positioning of new lines for rotated text

2017-04-06 17:49:08 -03:00

GameSession

Merge branch 'master' into new-netcode

2017-04-24 19:10:51 +03:00

GUI

Merge branch 'master' into new-netcode

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

Items

Merge branch 'master' into new-netcode

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

Map

Merge branch 'master' into new-netcode

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

Networking

Merge branch 'master' into new-netcode

2017-04-24 19:10:51 +03:00

Particles

Particle collision and project file fixes

2017-04-03 18:32:49 +03:00

Physics

CPR syncing + some refactoring

2017-03-22 20:05:50 +02:00

Screens

Merge branch 'master' into new-netcode

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

Sounds

Fire sound fix: the sounds were freed after each round without ever loading them again. The sound objects still existed and had some buffer ID assigned though, causing an incorrect clip to be played or OpenAL errors to be thrown on successive rounds. (Now freed sounds always have a buffer ID of -1)

2017-04-03 20:59:02 +03:00

Utils

Reactors, sonars, nav terminals, pumps and batteries use similar delayed correction logic as doors and inventories.

2017-04-11 00:48:53 +03:00

Camera.cs

Merge branch 'master' into new-netcode

2017-02-13 22:04:28 +02: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

2017-04-23 21:40:11 +03: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

2017-04-03 18:36:22 +03:00

GameSettings.cs

Merge branch 'master' into new-netcode

2017-04-23 21:40:11 +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

SharpFont + ScalableFont implementation

2017-03-07 13:44:42 -03:00

Properties.cs

Merge branch 'master' into new-netcode

2017-02-13 22:04:28 +02:00

Sprite.cs

9-Sliced UI sprites & some new UI graphics

2017-04-07 22:22:07 +03:00

SpriteSheet.cs

Animated fire & smoke particles

2017-03-30 21:32:08 +03:00

Timing.cs

Clients that are waiting for very old events are kicked

2017-03-01 16:40:07 -03:00