juanjp600 14ae355f19 Merge remote-tracking branch 'refs/remotes/barotrauma/combat-mission' ...

Conflicts:
	Subsurface/Source/GUI/GUIListBox.cs

2016-10-04 22:30:29 -03:00

..

Characters

Separated inventory update & rendering logic

2016-10-04 23:52:32 +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

Host can have subs spawn with more items

2016-10-04 22:28:13 -03:00

GameSession

Moved some UI element updates from draw to update

2016-10-04 18:28:56 +03:00

GUI

Merge remote-tracking branch 'refs/remotes/barotrauma/combat-mission'

2016-10-04 22:30:29 -03:00

Items

Separated inventory update & rendering logic

2016-10-04 23:52:32 +03:00

Map

Moved some more UI update logic from draw to update

2016-10-04 20:41:00 +03:00

Networking

Merge remote-tracking branch 'refs/remotes/barotrauma/combat-mission'

2016-10-04 22:30:29 -03:00

Particles

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

2016-10-04 19:54:17 +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

Separated inventory update & rendering logic

2016-10-04 23:52:32 +03:00

Sounds

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

2016-09-24 21:26: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

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

2016-10-04 19:54:17 +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 branch 'level-gen-overhaul'

2016-09-27 20:19:29 +03:00

FrameCounter.cs

Switch to Barotrauma & too many misc changes to remember

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

GameMain.cs

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

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

GameSettings.cs

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

2016-10-02 22:24:31 -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

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