Merge remote branch 'origin/fruitiex/loadscreen'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 12 Dec 2010 21:05:17 +0000 (22:05 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 12 Dec 2010 21:05:17 +0000 (22:05 +0100)
defaultXonotic.cfg
gfx/loading.tga

index 814c1bc..1d91084 100644 (file)
@@ -1978,7 +1978,7 @@ scr_conscroll3_y 0
 scr_conscroll_x -0.1
 scr_conscroll_y -0.3
 
-scr_loadingscreen_background 0
+scr_loadingscreen_background 1
 scr_loadingscreen_barcolor "0 0.5 1"
 scr_loadingscreen_barheight 20
 scr_loadingscreen_count 1
index 589a7fd..44ebb52 100644 (file)
Binary files a/gfx/loading.tga and b/gfx/loading.tga differ