Merge branch 'master' into 'master'

Prevent rendering issues again. See merge request core-developers/forge!2057
2025-11-15 10:18:01 +00:00 · 2019-08-25 10:59:24 +00:00
parent 45fd90f678 70bd959ca9
commit c1eb0d84a1
9 changed files with 1 additions and 0 deletions
--- a/forge-gui-android/AndroidManifest.xml
+++ b/forge-gui-android/AndroidManifest.xml
@@ -15,6 +15,7 @@

    <application
        android:allowBackup="true"
+        android:configChanges="keyboard|keyboardHidden|navigation|orientation|screenSize|screenLayout"
        android:icon="@mipmap/ic_launcher"
        android:roundIcon="@mipmap/ic_launcher_round"
        android:label="@string/app_name"
--- a/forge-gui/res/skins/darkforge/bg_chaos_wheel.png
+++ b/forge-gui/res/skins/darkforge/bg_chaos_wheel.png
--- a/forge-gui/res/skins/darkforge/bg_match.jpg
+++ b/forge-gui/res/skins/darkforge/bg_match.jpg
--- a/forge-gui/res/skins/darkforge/bg_splash.png
+++ b/forge-gui/res/skins/darkforge/bg_splash.png
--- a/forge-gui/res/skins/darkforge/bg_texture.jpg
+++ b/forge-gui/res/skins/darkforge/bg_texture.jpg
--- a/forge-gui/res/skins/darkforge/font1.ttf
+++ b/forge-gui/res/skins/darkforge/font1.ttf
--- a/forge-gui/res/skins/darkforge/sprite_avatars.png
+++ b/forge-gui/res/skins/darkforge/sprite_avatars.png
--- a/forge-gui/res/skins/darkforge/sprite_icons.png
+++ b/forge-gui/res/skins/darkforge/sprite_icons.png
--- a/forge-gui/res/skins/darkforge/sprite_planar_conquest.png
+++ b/forge-gui/res/skins/darkforge/sprite_planar_conquest.png