Merge branch 'master' into divVerent/desktopfullscreen
authorRudolf Polzer <divverent@xonotic.org>
Tue, 17 Sep 2013 19:39:37 +0000 (21:39 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 17 Sep 2013 19:39:37 +0000 (21:39 +0200)
Conflicts:
qcsrc/menu/menu.qc

1  2 
defaultXonotic.cfg
qcsrc/common/util-pre.qh
qcsrc/menu/menu.qc
qcsrc/menu/xonotic/slider_resolution.c

Simple merge
Simple merge
@@@ -91,10 -91,9 +91,10 @@@ void m_init(
        }
  }
  
- float MENU_ASPECT = 1.25; // 1280x1024
- float MENU_MINHEIGHT = 600;
const float MENU_ASPECT = 1.25; // 1280x1024
const float MENU_MINHEIGHT = 600;
 -float conwidth_s, conheight_s, realconwidth, realconheight, screenconwidth, screenconheight;
 +float conwidth_s, conheight_s, vidwidth_s, vidheight_s, realconwidth,
 +      realconheight, screenconwidth, screenconheight;
  void draw_reset_cropped()
  {
        draw_reset(screenconwidth, screenconheight, 0.5 * (realconwidth - screenconwidth), 0.5 * (realconheight - screenconheight));