Regalis 62dd055e8d Merge branch 'master' into animcontroller-overhaul ...

Conflicts:
	Subsurface/Content/Characters/Crawler/crawler.xml
	Subsurface/Source/Characters/AICharacter.cs
	Subsurface/Source/Characters/Animation/FishAnimController.cs
	Subsurface/Source/Characters/Animation/Ragdoll.cs
	Subsurface/Source/Characters/Character.cs
	Subsurface/Source/Map/Submarine.cs
	Subsurface/Source/Map/SubmarineBody.cs
	Subsurface/Source/Networking/GameClient.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Physics/PhysicsBody.cs

2016-10-25 20:09:25 +03:00

..

Characters

Merge branch 'master' into animcontroller-overhaul

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

Fixed monster/artifact events being out of sync between the server and the clients

2016-10-25 18:58:56 +03:00

GameSession

ItemRemover -> EntityRemover, clients reset spawner & remover when starting a new round

2016-10-12 20:46:47 +03:00

GUI

Merge branch 'master' into new-netcode

2016-10-12 21:12:21 +03:00

Items

Merge branch 'master' into animcontroller-overhaul

2016-10-25 20:09:25 +03:00

Map

Merge branch 'master' into animcontroller-overhaul

2016-10-25 20:09:25 +03:00

Networking

Merge branch 'master' into animcontroller-overhaul

2016-10-25 20:09:25 +03:00

Particles

Added a particle trail to railgun shells

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

Physics

Merge branch 'master' into animcontroller-overhaul

2016-10-25 20:09:25 +03:00

Screens

Merge branch 'master' into animcontroller-overhaul

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

Backported animcontroller-overhaul

2016-10-22 15:18:16 +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