Merge branch 'master' into nyov/dedicated-startupscreen

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 7f85e4d04dee3fa75964114b5ceb2b4f3b322aeb..7f8f1f2a7b77f7f539c2d39e76f8f278a7244eb3 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1979,7 +1979,8 @@ snd_identicalsoundrandomization_tics    1
 scr_loadingscreen_background 0
 scr_loadingscreen_barcolor "0 0.5 1"
 scr_loadingscreen_barheight 12
-scr_loadingscreen_count 13
+scr_loadingscreen_count 14
+scr_loadingscreen_firstforstartup 1
 scr_loadingscreen_scale 999
 scr_loadingscreen_scale_base 1
 scr_loadingscreen_scale_limit 2

diff --git a/gfx/loading.tga b/gfx/loading.tga
index 3b0020261a75ecc9c9a4ac911b7f7d9616c72e4c..8f2b062712e3d4b1cab7263c7e22a3b9528704e0 100644 (file)
Binary files a/gfx/loading.tga and b/gfx/loading.tga differ

diff --git a/gfx/loading14.tga b/gfx/loading14.tga
new file mode 100644 (file)
index 0000000..3b00202
Binary files /dev/null and b/gfx/loading14.tga differ