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

..

BlurEffect.cs

- resetting the "blood overlay" when switching the controlled character

2016-05-26 18:03:08 +03:00

EditCharacterScreen.cs

Backported animcontroller-overhaul

2016-10-22 15:18:16 +03:00

EditMapScreen.cs

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

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

GameScreen.cs

Merge branch 'master' into animcontroller-overhaul

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

LobbyScreen.cs

Cargo spawning fix again: items are spawned slightly above the bottom of the cargo room (because the item is only inside the hull if pos.Y > hull.rect.bottom)

2016-10-09 17:33:51 +03:00

MainMenuScreen.cs

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

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

NetLobbyScreen.cs

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

2016-09-24 21:28:37 -03:00

NetLobbyVoting.cs

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

2016-09-24 21:28:37 -03:00

Screen.cs

Fixes and minor enhancements for sub editor

2016-10-06 21:15:01 -03:00

ServerListScreen.cs

Backported vsync changes from new-netcode, WIP hull visibility culling

2016-10-02 22:24:31 -03:00

sygwkgy0.iv5

Infinite wall fixes, pressure damage to sub, sub/mode voting & randomization working now, better ui scaling

2015-10-31 00:29:51 +02:00