juanjp600 6e83ef7626 Merge remote-tracking branch 'refs/remotes/origin/master' ...

Conflicts:
	Subsurface/Barotrauma.csproj
	Subsurface/Source/Characters/AI/EnemyAIController.cs
	Subsurface/Source/Characters/AICharacter.cs
	Subsurface/Source/Characters/Character.cs
	Subsurface/Source/Items/Components/DockingPort.cs
	Subsurface/Source/Items/Components/Door.cs
	Subsurface/Source/Items/Item.cs
	Subsurface/Source/Networking/GameClient.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Physics/PhysicsBody.cs

2016-08-30 18:04:49 -03:00

..

Characters

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

2016-08-30 18:04:49 -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

Changes to the layout of the "manage players" menu

2016-08-29 18:28:31 +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/origin/master'

2016-08-30 18:04:49 -03:00

Map

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

2016-08-30 18:04:49 -03:00

Networking

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

2016-08-30 18:04:49 -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

Hacked clients can't send chat messages from other characters anymore

2016-08-30 17:35:58 -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

Navigation requires power, locationtypes and missions included in content packages

2016-02-18 22:04:47 +02:00

CoroutineManager.cs

Small rewrite of the Coroutine logic to stop it from going out of bounds and crashing.

2016-08-30 22:51:40 +02:00

DebugConsole.cs

Option to choose which character to control with the console command when there are multiple characters with the same name

2016-08-30 19:04:06 +03:00

FrameCounter.cs

Switch to Barotrauma & too many misc changes to remember

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

GameMain.cs

- clients don't spawn character jobitems themselves (item data is written in the StartGame network message)

2016-07-29 18:38:42 +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