From: Rudolf Polzer Date: Mon, 20 Jun 2011 08:13:40 +0000 (+0200) Subject: Merge remote branch 'origin/mirceakitsune/new_loading_screens' X-Git-Tag: xonotic-v0.5.0~199^2~14^2~1 X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=4f920aea0bcef26f3e026827db1f3172606651bf;hp=4afb8036440fbfb9b22ec4c71dfe6fa8c25751dd;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'origin/mirceakitsune/new_loading_screens' --- diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 10ef2b93b..35eb6b24e 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -2127,7 +2127,7 @@ set snd_soundradius 1200 scr_loadingscreen_background 0 scr_loadingscreen_barcolor "0 0.5 1" scr_loadingscreen_barheight 12 -scr_loadingscreen_count 12 +scr_loadingscreen_count 13 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 76a7edf1f..67580e9da 100644 Binary files a/gfx/loading.tga and b/gfx/loading.tga differ diff --git a/gfx/loading10.tga b/gfx/loading10.tga index 5f453bed6..6cddc0ca3 100644 Binary files a/gfx/loading10.tga and b/gfx/loading10.tga differ diff --git a/gfx/loading11.tga b/gfx/loading11.tga index 5fb261efc..0cee44b8c 100644 Binary files a/gfx/loading11.tga and b/gfx/loading11.tga differ diff --git a/gfx/loading12.tga b/gfx/loading12.tga index 6345a9aa6..0314a97a7 100644 Binary files a/gfx/loading12.tga and b/gfx/loading12.tga differ diff --git a/gfx/loading13.tga b/gfx/loading13.tga new file mode 100644 index 000000000..ef3087844 Binary files /dev/null and b/gfx/loading13.tga differ diff --git a/gfx/loading2.tga b/gfx/loading2.tga index 3aa4a29e1..63c4c4782 100644 Binary files a/gfx/loading2.tga and b/gfx/loading2.tga differ diff --git a/gfx/loading3.tga b/gfx/loading3.tga index 639608565..42ae5cd48 100644 Binary files a/gfx/loading3.tga and b/gfx/loading3.tga differ diff --git a/gfx/loading4.tga b/gfx/loading4.tga index eaf44d094..62877a672 100644 Binary files a/gfx/loading4.tga and b/gfx/loading4.tga differ diff --git a/gfx/loading5.tga b/gfx/loading5.tga index c06d32320..96ec6c4a7 100644 Binary files a/gfx/loading5.tga and b/gfx/loading5.tga differ diff --git a/gfx/loading6.tga b/gfx/loading6.tga index 7c8007c44..a0e2fc853 100644 Binary files a/gfx/loading6.tga and b/gfx/loading6.tga differ diff --git a/gfx/loading7.tga b/gfx/loading7.tga index 56aa4afc4..87d5f13e0 100644 Binary files a/gfx/loading7.tga and b/gfx/loading7.tga differ diff --git a/gfx/loading8.tga b/gfx/loading8.tga index a41d344ef..c86897044 100644 Binary files a/gfx/loading8.tga and b/gfx/loading8.tga differ diff --git a/gfx/loading9.tga b/gfx/loading9.tga index dc6360369..ac758099a 100644 Binary files a/gfx/loading9.tga and b/gfx/loading9.tga differ