Merge branch 'master' into network

c1f5866f · Leonard · 0da2cc42 · a152be63 · c1f5866f · c1f5866f
Commit c1f5866f authored 4 years ago by Leonard
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/effects/door_highlight.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/effects/door_highlight.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/statusUI/top_shieldsquare1_on.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/statusUI/top_shieldsquare1_on.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/statusUI/top_hull.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/statusUI/top_hull.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/statusUI/top_scrap.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/statusUI/top_scrap.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/statusUI/top_shields4_off.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/statusUI/top_shields4_off.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/optionsUI/escape_continue_on.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/optionsUI/escape_continue_on.png
--- a/core/assets/inventory/inventory.png
+++ b/core/assets/inventory/inventory.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/map/dotted_line.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/map/dotted_line.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/map/map_icon_diamond_circle.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/map/map_icon_diamond_circle.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/map/map_icon_boss.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/map/map_icon_boss.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/map/map_icon_ship.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/map/map_icon_ship.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/box_text_sectors.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/box_text_sectors.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/map/map_overlay.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/map/map_overlay.png
--- a/core/assets/options/audio.png
+++ b/core/assets/options/audio.png
--- a/core/assets/options/control.png
+++ b/core/assets/options/control.png
--- a/core/assets/options/credits.png
+++ b/core/assets/options/credits.png
--- a/core/assets/options/escape_audio_on.png
+++ b/core/assets/options/escape_audio_on.png
--- a/core/assets/options/escape_back_on.png
+++ b/core/assets/options/escape_back_on.png
--- a/core/assets/options/escape_control_on.png
+++ b/core/assets/options/escape_control_on.png
--- a/core/assets/options/escape_credits_on.png
+++ b/core/assets/options/escape_credits_on.png