Joonas Rikkonen b1ee229170 (6c5225d9e) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev

2019-06-09 17:39:50 +03:00

..

BlurEffect.cs

Removed unnecessary using directives

2017-07-05 18:35:09 +03:00

CampaignSetupUI.cs

(a410fd46c) Trying to help the merge script through a jungle of merges

2019-06-04 16:37:31 +03:00

CampaignUI.cs

(a410fd46c) Trying to help the merge script through a jungle of merges

2019-06-04 16:37:31 +03:00

CharacterEditorScreen.cs

(683b11c00) High-res shuttle preview images + merge fix

2019-05-16 08:49:01 +03:00

CreditsPlayer.cs

(0c86b4b28) Revert "Don't reset the los if there is no client (single player). Fixes los resetting between game sessions (less tedious debugging)."

2019-06-04 16:02:25 +03:00

GameScreen.cs

(e7b2add9d) Merge branch 'human-ai' of https://github.com/Regalis11/Barotrauma-development into human-ai

2019-05-16 05:30:39 +03:00

LevelEditorScreen.cs

(0c86b4b28) Revert "Don't reset the los if there is no client (single player). Fixes los resetting between game sessions (less tedious debugging)."

2019-06-04 16:02:25 +03:00

LobbyScreen.cs

38f1ddb...178a853: v0.8.9.1, removed content folder

2019-03-18 20:39:27 +02:00

MainMenuScreen.cs

(6c5225d9e) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev

2019-06-09 17:39:50 +03:00

NetLobbyScreen.cs

(97e5bb5d1) Don't show the "kick / vote to kick" buttons when inspecting the owner of the server, or display the "x voted to kick" message if someone tries to vote kick the owner.

2019-06-09 17:38:20 +03:00

OldCharacterEditorScreen.cs

38f1ddb...178a853: v0.8.9.1, removed content folder

2019-03-18 20:39:27 +02:00

ParticleEditorScreen.cs

1ec6577...e08c5e7

2019-03-18 21:12:02 +02:00

Screen.cs

38f1ddb...178a853: v0.8.9.1, removed content folder

2019-03-18 20:39:27 +02:00

ServerListScreen.cs

(d5505ed3d) Show the name of the server in the "connecting to..." popup instead of the IP address

2019-06-04 16:52:07 +03:00

SpriteEditorScreen.cs

(9adead624) Add source rect nudging in the sprite editor (move the source rect position with the arrows).

2019-06-04 16:43:52 +03:00

SteamWorkshopScreen.cs

(0c86b4b28) Revert "Don't reset the los if there is no client (single player). Fixes los resetting between game sessions (less tedious debugging)."

2019-06-04 16:02:25 +03:00

SubEditorScreen.cs

(44694344e) Don't allow deleting vanilla subs in the sub editor

2019-06-04 16:44:10 +03:00