From: Rudolf Polzer Date: Sat, 12 Oct 2013 17:27:49 +0000 (+0200) Subject: Revert "Require >= 800x600 now. Users who want lower res and have a higher res deskto... X-Git-Tag: xonotic-v0.8.0~289 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8506b83442177c0558e823910f4c3673ac3d2777;p=xonotic%2Fxonotic-data.pk3dir.git Revert "Require >= 800x600 now. Users who want lower res and have a higher res desktop will need to manually set vid_width/vid_height." no, users probably can know what they are doing, and adjust expectations ;) This reverts commit f1a4f975c754e9993e5617dc86e7025779f75bd2. --- diff --git a/qcsrc/menu/xonotic/slider_resolution.c b/qcsrc/menu/xonotic/slider_resolution.c index dc5b6d2c1..a7cf04bf7 100644 --- a/qcsrc/menu/xonotic/slider_resolution.c +++ b/qcsrc/menu/xonotic/slider_resolution.c @@ -141,7 +141,7 @@ void XonoticResolutionSlider_loadResolutions(entity me, float fullscreen) r = getresolution(i); if(r_x == 0 && r_y == 0) break; - if(r_x < 800 || r_y < 600) + if(r_x < 640 || r_y < 480) continue; if(r_x > 2 * r_y) // likely dualscreen resolution, skip this one if(autocvar_menu_vid_allowdualscreenresolution <= 0) @@ -156,6 +156,12 @@ void XonoticResolutionSlider_loadResolutions(entity me, float fullscreen) if(me.nValues == 0) { + me.addResolution(me, 640, 480, 1); // pc res + me.addResolution(me, 720, 480, 1.125); // DVD NTSC 4:3 + me.addResolution(me, 720, 576, 0.9375); // DVD PAL 4:3 + me.addResolution(me, 720, 480, 0.84375); // DVD NTSC 16:9 + me.addResolution(me, 720, 576, 0.703125); // DVD PAL 16:9 + me.addResolution(me, 800, 480, 1); // 480p at 1:1 pixel aspect me.addResolution(me, 800, 600, 1); // pc res me.addResolution(me, 1024, 600, 1); // notebook res me.addResolution(me, 1024, 768, 1); // pc res