Merge remote branch 'origin/mirceakitsune/new_loading_screens'

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 10ef2b93bf7f857307f5ced91e35a579d5bcfdb4..35eb6b24efa3ea6ef570655c03f66697e50559e4 100644 (file)
--- 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 76a7edf1fad45a5333f64ec13d3430c071efa4d2..67580e9daccdd08a4e6e8a66ce63fd7f42e7997f 100644 (file)
Binary files a/gfx/loading.tga and b/gfx/loading.tga differ

diff --git a/gfx/loading10.tga b/gfx/loading10.tga
index 5f453bed6fd06bfe5918d341139166f5333cd60e..6cddc0ca32b09d1ca0b69b9c9ed574bab7e8bff3 100644 (file)
Binary files a/gfx/loading10.tga and b/gfx/loading10.tga differ

diff --git a/gfx/loading11.tga b/gfx/loading11.tga
index 5fb261efc6cc1d8bc8416a6c266a83856c6613e0..0cee44b8c5ebb1385f428d99ac610a783dd6500c 100644 (file)
Binary files a/gfx/loading11.tga and b/gfx/loading11.tga differ

diff --git a/gfx/loading12.tga b/gfx/loading12.tga
index 6345a9aa67343c06f38faa3f28e1450cab08a587..0314a97a7a1c4f836516d7d608ff9a11b8e49bcc 100644 (file)
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 (file)
index 0000000..ef30878
Binary files /dev/null and b/gfx/loading13.tga differ

diff --git a/gfx/loading2.tga b/gfx/loading2.tga
index 3aa4a29e150abc0068394c2a16c9761c4c936d33..63c4c4782023651f310c4c51aa5c3a6656450465 100644 (file)
Binary files a/gfx/loading2.tga and b/gfx/loading2.tga differ

diff --git a/gfx/loading3.tga b/gfx/loading3.tga
index 639608565eafd28867b74cdebb00158f1aa02d15..42ae5cd48f228478a6ae26ac18f08571cfa53b2c 100644 (file)
Binary files a/gfx/loading3.tga and b/gfx/loading3.tga differ

diff --git a/gfx/loading4.tga b/gfx/loading4.tga
index eaf44d09496ca033b8e57f97c1e79739117211be..62877a6729f2dcf2ca2e72520be72a041c790d68 100644 (file)
Binary files a/gfx/loading4.tga and b/gfx/loading4.tga differ

diff --git a/gfx/loading5.tga b/gfx/loading5.tga
index c06d32320fd7370f5376f3feb839c3a1b476139a..96ec6c4a742a03742dc65aedf8178a07b7e0fe29 100644 (file)
Binary files a/gfx/loading5.tga and b/gfx/loading5.tga differ

diff --git a/gfx/loading6.tga b/gfx/loading6.tga
index 7c8007c44680432d5f14cf900e20796951f65caf..a0e2fc85318dbf9081544ac239a531ee743e96da 100644 (file)
Binary files a/gfx/loading6.tga and b/gfx/loading6.tga differ

diff --git a/gfx/loading7.tga b/gfx/loading7.tga
index 56aa4afc4b19b7bbd24c7bb01a5824004471ccdc..87d5f13e058959833fc64cb1a90237f7a004bc39 100644 (file)
Binary files a/gfx/loading7.tga and b/gfx/loading7.tga differ

diff --git a/gfx/loading8.tga b/gfx/loading8.tga
index a41d344ef8b8e8b225d8f3d534a830aa1fc3078c..c8689704489adb6baf9b7bc5a0b4c3e2cef98a63 100644 (file)
Binary files a/gfx/loading8.tga and b/gfx/loading8.tga differ

diff --git a/gfx/loading9.tga b/gfx/loading9.tga
index dc636036947a0671376bf6fc9528afa92ad0db96..ac758099aa2eda35a61f45fd31c58dd3c688449d 100644 (file)
Binary files a/gfx/loading9.tga and b/gfx/loading9.tga differ