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

..

ComponentStyle.cs

Using ToLowerInvariant instead of ToLower (the game works for Turkish players now!)

2016-04-27 17:14:09 +03:00

GUI.cs

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

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

GUIButton.cs

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

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

GUIComponent.cs

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

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

GUIDropDown.cs

Fixed bug with GUIComponent children changing order in parent's list

2016-09-19 22:02:00 -03:00

GUIFrame.cs

Some cleanup using ReSharper (mostly removing redundancies)

2016-03-12 15:32:34 +02:00

GUIImage.cs

- camera follows the closest sub

2016-06-18 14:46:40 +03:00

GUIListBox.cs

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

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

GUIMessage.cs

Some cleanup using ReSharper (mostly removing redundancies)

2016-03-12 15:32:34 +02:00

GUIMessageBox.cs

File sharing fixes: canceling transfers, displaying transfers & progress server-side, invalid sub files aren't selected or sent

2016-02-27 00:25:13 +02:00

GUIProgressBar.cs

Fabricator, deconstructor, itemspawner & itemremover syncing, fixed placing hulls in editor, misc cleanup

2016-01-10 17:10:22 +02:00

GUIScrollBar.cs

- server log and item lists in editor can be filtered

2016-07-06 18:10:22 +03:00

GUIStyle.cs

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

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

GUITextBlock.cs

Host can have subs spawn with more items

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

GUITextBox.cs

Update/rendering logic separation (cherrypicked from commits 9ca3b24, bddcc36 & 9511bae)

2016-10-05 20:35:18 +03:00

GUITickBox.cs

Fixed child rects not being updated when modifying GUIButton or GUITickBox rects

2016-10-09 14:17:22 +03:00

LoadingScreen.cs

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

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