Merge remote branch 'refs/remotes/origin/fruitiex/fruitbalance'

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 260493ac780c16f55fc0b956c2cc87e47cbe002e..037505dd0a0a7ef79a202a061bc8591cf557a4ff 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1898,3 +1898,16 @@ set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping uzi and shotgun (f
 set g_movement_highspeed 1 "movement speed modification factor (only changes movement when above maxspeed)"
 
 set g_maxspeed 0 "player speed limit, faster players are killed (0 for unlimited speed)"
+
+scr_conalpha 1
+scr_conalpha2factor 0.3
+scr_conalpha3factor 1
+scr_conalphafactor 0.8
+scr_conbrightness 0.35
+scr_conforcewhiledisconnected 1
+scr_conscroll2_x 0.11
+scr_conscroll2_y 0.2
+scr_conscroll3_x 0
+scr_conscroll3_y 0
+scr_conscroll_x -0.1
+scr_conscroll_y -0.3

diff --git a/gfx/conback.tga b/gfx/conback.tga
index d8d927739b3fd02726912cae0b86cbb43eb0c9f1..39beb59eaf87602a7c7174bba3557289cfc99b78 100644 (file)
Binary files a/gfx/conback.tga and b/gfx/conback.tga differ

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

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