Merge branch 'master' into mirceakitsune/new_loading_screens

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 73d5d635246e93f15955c53141e14c587376fcfd..b2607dc977923c61d05948c809a7d91977440d7d 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -2018,10 +2018,6 @@ scr_conscroll3_y 0
 scr_conscroll_x -0.1
 scr_conscroll_y -0.3
 
-scr_loadingscreen_background 0
-scr_loadingscreen_barcolor "0 0.5 1"
-scr_loadingscreen_barheight 12
-scr_loadingscreen_count 1
 scr_conforcewhiledisconnected 0
 scr_infobar_height 12
 
@@ -2110,9 +2106,13 @@ set g_playerstats_debug 0 "when 1, player stats are dumped to the console too"
 set snd_soundradius 1200
 
 // loading screen
-scr_loadingscreen_scale 1
+scr_loadingscreen_background 0
+scr_loadingscreen_barcolor "0 0.5 1"
+scr_loadingscreen_barheight 12
+scr_loadingscreen_count 12
+scr_loadingscreen_scale 999
 scr_loadingscreen_scale_base 1
-scr_loadingscreen_scale_limit 1
+scr_loadingscreen_scale_limit 2
 
 // sRGB configuration (EXPERIMENTAL, needs maps to be relit)
 alias sRGBcorrect_on  "r_texture_sRGB_skin_diffuse 1;r_texture_sRGB_skin_gloss 1;r_texture_sRGB_skin_glow 1;r_texture_sRGB_reflect 1;r_texture_sRGB_skybox 1;v_gamma 2.2;r_restart"

diff --git a/gfx/loading.tga b/gfx/loading.tga
index 44ebb5294a7921b0f8e52f86753a6dcc7d0b0dbc..76a7edf1fad45a5333f64ec13d3430c071efa4d2 100644 (file)
Binary files a/gfx/loading.tga and b/gfx/loading.tga differ

diff --git a/gfx/loading10.tga b/gfx/loading10.tga
new file mode 100644 (file)
index 0000000..5f453be
Binary files /dev/null and b/gfx/loading10.tga differ

diff --git a/gfx/loading11.tga b/gfx/loading11.tga
new file mode 100644 (file)
index 0000000..5fb261e
Binary files /dev/null and b/gfx/loading11.tga differ

diff --git a/gfx/loading12.tga b/gfx/loading12.tga
new file mode 100644 (file)
index 0000000..6345a9a
Binary files /dev/null and b/gfx/loading12.tga differ

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

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

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

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

diff --git a/gfx/loading6.tga b/gfx/loading6.tga
new file mode 100644 (file)
index 0000000..7c8007c
Binary files /dev/null and b/gfx/loading6.tga differ

diff --git a/gfx/loading7.tga b/gfx/loading7.tga
new file mode 100644 (file)
index 0000000..56aa4af
Binary files /dev/null and b/gfx/loading7.tga differ

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

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