Merge branch 'master' into divVerent/gettextizing-the-source

diff --git a/qcsrc/menu/xonotic/dialog_news.c b/qcsrc/menu/xonotic/dialog_news.c
index 9924ca14ba71198d59c570e5a2e80d999953fa18..12cf0c23bc72fcd5ee78abd5fa6609bccb6f6701 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_news.c
+++ b/qcsrc/menu/xonotic/dialog_news.c
@@ -15,6 +15,6 @@ void XonoticNewsDialog_fill(entity me)
        entity e;
        me.TR(me);
                me.TD(me, 24, 1, e = spawnGecko());
-               e.configureBrowser( e, "http://alientrap.org/xonotic/index.php?module=news" );
+               e.configureBrowser( e, "http://www.xonotic.org/team/blog/" );
 }
 #endif

diff --git a/qcsrc/menu/xonotic/slider_resolution.c b/qcsrc/menu/xonotic/slider_resolution.c
index 7049f0f3cb8b311549a5d108d28bdf74f785b773..d5d013048e9c67b874487f84a7d2f15bacee8192 100644 (file)
--- a/qcsrc/menu/xonotic/slider_resolution.c
+++ b/qcsrc/menu/xonotic/slider_resolution.c
@@ -85,9 +85,22 @@ void XonoticResolutionSlider_configureXonoticResolutionSlider(entity me)
                r0 = r;
                if(r_x < 640 || r_y < 480)
                        continue;
+               if(r_x > 2 * r_y) // likely dualscreen resolution, skip this one
+                       continue;
                me.addResolution(me, r_x, r_y, r_z);
        }
 
+       if(me.nValues == 0)
+       {
+               me.addResolution(me, 640, 480, 1);
+               me.addResolution(me, 800, 600, 1);
+               me.addResolution(me, 1024, 768, 1);
+               me.addResolution(me, 1280, 960, 1);
+               me.addResolution(me, 1280, 1024, 1);
+               me.addResolution(me, 1650, 1080, 1);
+               me.addResolution(me, 1920, 1080, 1);
+       }
+
        me.configureXonoticTextSliderValues(me);
 }
 void XonoticResolutionSlider_loadCvars(entity me)