juanjp600 72033a581e Merge remote-tracking branch 'refs/remotes/barotrauma/master' ...

Conflicts:
	Subsurface/Properties/AssemblyInfo.cs
	Subsurface/Source/Characters/Character.cs
	Subsurface/Source/GUI/GUI.cs
	Subsurface/Source/GameMain.cs
	Subsurface/Source/GameSettings.cs
	Subsurface/Source/Items/CharacterInventory.cs
	Subsurface/Source/Items/Components/ItemComponent.cs
	Subsurface/Source/Items/Components/Machines/Pump.cs
	Subsurface/Source/Items/Components/Machines/Radar.cs
	Subsurface/Source/Items/Components/Machines/Steering.cs
	Subsurface/Source/Items/Components/Power/PowerContainer.cs
	Subsurface/Source/Items/Inventory.cs
	Subsurface/Source/Items/Item.cs
	Subsurface/Source/Items/ItemSpawner.cs
	Subsurface/Source/Map/Levels/WaterRenderer.cs
	Subsurface/Source/Map/LinkedSubmarine.cs
	Subsurface/Source/Map/Map/Map.cs
	Subsurface/Source/Map/Structure.cs
	Subsurface/Source/Map/Submarine.cs
	Subsurface/Source/Map/WayPoint.cs
	Subsurface/Source/Networking/GameClient.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Physics/PhysicsBody.cs
	Subsurface/Source/Screens/GameScreen.cs

2016-10-11 20:19:25 -03:00

..

Characters

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

2016-10-11 20:19:25 -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

Merged branch combat-mission into combat-mission

2016-10-10 09:58:06 -03:00

GameSession

Merged branch combat-mission into combat-mission

2016-10-10 09:58:06 -03:00

GUI

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

2016-10-11 20:19:25 -03:00

Items

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

2016-10-11 20:19:25 -03:00

Map

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

2016-10-11 20:19:25 -03:00

Networking

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

2016-10-11 20:19:25 -03:00

Particles

Added a particle trail to railgun shells

2016-10-09 15:13:41 +03:00

Physics

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

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

Screens

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

2016-10-11 20:19:25 -03:00

Sounds

Audio channel states visible in debug view + some sound fixes:

2016-10-09 20:11:08 +03:00

Utils

- saving after MainSub has been removed (i.e. saving after returning to map screen) doesn't break save files anymore

2016-09-28 19:16:50 +03:00

Camera.cs

Holding F gives old mousewheel zoom functionality

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

ContentPackage.cs

Linux damageshader, fixed keyhits being registered multiple times, added LevelGenerationParams.xml to the vanilla content package

2016-09-29 19:04:45 +03:00

CoroutineManager.cs

Search and destroy mission

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

DebugConsole.cs

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

2016-10-11 20:19:25 -03:00

FrameCounter.cs

Switch to Barotrauma & too many misc changes to remember

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

GameMain.cs

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

2016-10-11 20:19:25 -03:00

GameSettings.cs

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

2016-10-11 20:19:25 -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

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

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

Properties.cs

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

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

Sprite.cs

WallSection flipping

2016-10-03 22:40:14 +03: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