juanjp600 6f25bee9e1 Merge remote-tracking branch 'refs/remotes/barotrauma/master' ...

Conflicts:
	.vs/Subsurface_Solution/v14/.suo
	Subsurface/Barotrauma.csproj
	Subsurface/Properties/AssemblyInfo.cs
	Subsurface/Source/Items/ItemSpawner.cs
	Subsurface/Source/Networking/GameClient.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Networking/GameServerLogin.cs

2016-09-03 17:54:33 -03:00

..

Characters

Merge remote-tracking branch 'refs/remotes/barotrauma/master'

2016-09-03 17:54:33 -03:00

EventInput

Merged linux changes, fixed first item in inventory not being loaded, fixed levels breaking if re-entering the same level

2015-11-19 16:29:13 +02:00

Events

Artifacts are spread out better throughout the levels

2016-08-28 20:28:24 +03:00

GameSession

Whitelist + conflict resolve

2016-09-03 14:57:36 -03:00

GUI

Adding a textblock with whitespace as the text doesn't blow up GUIListBoxes anymore, missing key bindings don't crash the game

2016-08-29 20:51:00 +03:00

Items

Merge remote-tracking branch 'refs/remotes/barotrauma/master'

2016-09-03 17:54:33 -03:00

Map

Merge remote-tracking branch 'refs/remotes/barotrauma/master'

2016-09-03 17:54:33 -03:00

Networking

Merge remote-tracking branch 'refs/remotes/barotrauma/master'

2016-09-03 17:54:33 -03:00

Particles

Particle emitters can be assigned to statuseffects, fixed item.Submarine not being set correctly for throwable items, flare particles + sounds, nerfed some of the medical items

2016-05-11 20:16:50 +03:00

Physics

Removed Fill/ReadNetworkData

2016-08-29 20:02:46 -03:00

Screens

Merge remote-tracking branch 'refs/remotes/barotrauma/master'

2016-09-03 17:54:33 -03:00

Sounds

Parts of the submarine that are left behind in the level will stay there, it's possible to leave the level without the main sub (e.g. in an escape shuttle)

2016-07-16 16:14:51 +03:00

Utils

Forgot to commit these

2016-08-28 17:05:39 +03:00

Camera.cs

- fixed camera "twitching" when trying to move it above the upper limit of the level

2016-07-15 19:21:10 +03:00

ContentPackage.cs

BackgroundCreatureManager and BackgroundSpriteManager can be overridden via Content packages

2016-09-03 18:05:26 +02:00

CoroutineManager.cs

Re-enabling coroutines

2016-08-30 20:36:44 -03:00

DebugConsole.cs

Merge remote-tracking branch 'refs/remotes/barotrauma/master'

2016-09-03 17:54:33 -03:00

FrameCounter.cs

Switch to Barotrauma & too many misc changes to remember

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

GameMain.cs

Minor fixes and tweaks

2016-09-01 22:22:45 -03:00

GameSettings.cs

Adding a textblock with whitespace as the text doesn't blow up GUIListBoxes anymore, missing key bindings don't crash the game

2016-08-29 20:51:00 +03:00

IPropertyObject.cs

Switch to Barotrauma & too many misc changes to remember

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

PlayerInput.cs

Husk infections, manually attacking when controlling a creature

2016-08-28 16:16:02 +03:00

Program.cs

Progress (compiles now)

2016-06-09 22:15:50 +03:00

Properties.cs

- gameServerSettings refactoring: using ObjectProperties for saving/loading instead of doing it manually

2016-07-21 21:18:38 +03:00

Sprite.cs

Fix for broken repeating textures.

2016-08-28 23:42:41 +02:00