Regalis 1f07b18e5b Merge branch 'master' into new-netcode ...

Conflicts:
	Subsurface/Properties/AssemblyInfo.cs
	Subsurface/Source/Items/Components/DockingPort.cs
	Subsurface/Source/Items/Components/Signal/Wire.cs
	Subsurface/Source/Items/Item.cs

2016-12-29 22:18:27 +02:00

..

Characters

Merge branch 'master' into new-netcode

2016-12-29 22:18:27 +02:00

EventInput

v0.5.3.3

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

Events

Level generation fix: voronoiCell collision is disabled if any of it's edges intersects with any part of an alien ruin

2016-12-01 16:14:24 +02:00

GameSession

Merge branch 'master' into new-netcode

2016-12-29 22:18:27 +02:00

GUI

Merge branch 'master' into new-netcode

2016-12-29 22:18:27 +02:00

Items

Merge branch 'master' into new-netcode

2016-12-29 22:18:27 +02:00

Map

Merge branch 'master' into new-netcode

2016-12-29 22:18:27 +02:00

Networking

Merge branch 'master' into new-netcode

2016-12-29 22:18:27 +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-12-29 22:18:27 +02:00

Screens

Merge branch 'master' into new-netcode

2016-12-29 22:18:27 +02:00

Sounds

Additional null check in Wire Update, stopping paused sounds before deleting them (prevents an OpenAL error when switching to sub editor when the mainmenu drone sound is playing)

2016-12-21 20:35:38 +02:00

Utils

Adjusting submarine spawnposition if the sub (or any docked subs) intersect with walls

2016-12-20 16:11:47 +02:00

Camera.cs

Merge branch 'master' into new-netcode

2016-12-29 22:18:27 +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

2016-12-29 22:18:27 +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-12-29 22:18:27 +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

Fixed endless crash messagebox spam if the game fails to resolve a SharpDX exception on startup

2016-12-11 22:43:05 +02:00

Properties.cs

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

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

Sprite.cs

Simple MapEntity visibility culling (structures outside the camera view or items with nothing to render aren't drawn)

2016-11-30 21:09:11 +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