Patches #1063

Merge in xonotic/xonotic-data.pk3dir.git: mirceakitsune/menu_tweaks

Added by git-manager about 2 years ago. Updated over 1 year ago.

Status:RejectedStart date:02/09/2012
Priority:HighDue date:
Assignee:Samual% Done:

100%

Category:-
Target version:Xonotic - 1.0

Description

Purpose of the branch:

Some changes to the new menu for 0.6. The purpose was to re-add some settings that got removed (which I still use and consider best to leave there), but I also changed the sorting of some items and other minor tweaks. Text strings are not modified, and this change doesn't break the latest translations.

Repository: xonotic/xonotic-data.pk3dir.git
Commit: ec71f8e316b96ed315aaf01eca57890d333d8ceb
Branch: mirceakitsune/menu_tweaks

Merge commands:

cd data/xonotic-data.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff 'ec71f8e316b96ed315aaf01eca57890d333d8ceb'..'origin/mirceakitsune/menu_tweaks'

# please check that the diff you just saw did not contain anything complex that
# needs a new merge request, and review these changes

git merge --no-ff 'origin/mirceakitsune/menu_tweaks'

# please make sure this merge worked, and if not, fix merge conflicts and git
# commit BEFORE the next command
#
# also, THIS is the point to do final pre-merge testing
#
# use git reset --hard origin/master to bail out

git push && git push --delete origin 'mirceakitsune/menu_tweaks'

Diffstat:

 .../xonotic/dialog_multiplayer_playersetup_model.c |    2 +-
 .../xonotic/dialog_multiplayer_playersetup_view.c  |   33 +++++++++++--------
 qcsrc/menu/xonotic/dialog_settings_audio.c         |   34 +++++++++----------
 qcsrc/menu/xonotic/dialog_settings_effects.c       |   31 ++++++++++--------
 4 files changed, 53 insertions(+), 47 deletions(-)

Revision log:

commit ec71f8e316b96ed315aaf01eca57890d333d8ceb
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Fix another spacing. This should conclude my proposed changes to the menu for 0.6

commit 24dbe4594d21ad336e934834233229f9ccc7e380
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Arrange the effects menu a bit again

commit 95ffcaddac0b7eee17802473e8f5df9d57c5493b
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Arrange the effects menu in a way that looks better, and should be more correct in my opinion

commit ac79b8a051c6a7ddcf27ae924c2759064ba39e89
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Tweak some slider ranges for more consistency

commit cadaa06c7eeabb9461549f787974b07e220b143c
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Tweak another slider

commit d0aa1c0dda78a6a58f4b72712e686ebb04a80b1b
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Fix slider width in the View menu

commit 40d4cda717b65f7fb4417f07e543ee50c99c2556
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Use the previous text strings for the view settings I changed, so translation changes won't be required.

commit bc219d171f1680017b9bccd16daae799b3f58e48
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Fix translated text. Also allow tweaking the intensity of the idle view waving

commit b9393d191fc679e14b111fd8665e810c276087b6
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Re-enable a slider for view bobbing intensity. Those of us who care about every effect also tweak this :P It doesn't add extra lines, so it doesn't clutter the menu

commit e1c0380839b6edea6eb7c0ab4b01123fa8def5ef
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Re-enable spatial voice settings in the Audio menu. I still use these, and believe they are important settings.

User agreed to the GPLv2+.

Diff:

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_model.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_model.c
index 5098250..18bd832 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_model.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_model.c
@@ -26,7 +26,7 @@ void XonoticModelDialog_fill(entity me)

     me.TR(me);
         me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Body fading:")));
-        me.TD(me, 1, 2, e = makeXonoticSlider(0, 2, 0.2, "cl_deathglow"));
+        me.TD(me, 1, 2, e = makeXonoticSlider(0, 2, 0.1, "cl_deathglow"));
     me.TR(me);
         me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Gibs:")));
         me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_nogibs"));
diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_view.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_view.c
index bfa52ec..0d3c3d5 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_view.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_view.c
@@ -22,7 +22,7 @@ string XonoticViewDialog_toString(entity me)
 }
 void XonoticViewDialog_fill(entity me)
 {
-    entity e;
+    entity e, sl;

     me.TR(me);
         me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Field of view:")));
@@ -65,47 +65,52 @@ void XonoticViewDialog_fill(entity me)
     me.TR(me);
         me.TDempty(me, 0.2);
         me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, ZCTX(_("VZOOM^Speed"))));
-        me.TD(me, 1, 2, e = makeXonoticSlider(-1, 1, 0.2, "cl_velocityzoom"));
+        me.TD(me, 1, 2, e = makeXonoticSlider(-1, 1, 0.1, "cl_velocityzoom"));
         setDependent(e, "cl_velocityzoom_type", 1, 3);
     me.TR(me);
     me.TR(me);
         me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "cl_clippedspectating", _("Allow passing through walls while spectating")));

-    me.gotoRC(me, 0, 3.2); me.setFirstColumn(me, me.currentColumn);
-        me.TD(me, 1, 3, e = makeXonoticRadioButton(1, "chase_active", "0", _("1st person perspective")));
+    me.gotoRC(me, 0, 3); me.setFirstColumn(me, me.currentColumn);
+        me.TD(me, 1, 3.2, e = makeXonoticRadioButton(1, "chase_active", "0", _("1st person perspective")));
         makeMulti(e, "crosshair_hittest_showimpact");
     me.TR(me);
         me.TDempty(me, 0.2);
-        me.TD(me, 1, 2.8, e = makeXonoticCheckBoxEx(0.05, 0, "cl_bobfall", _("Smooth the view when landing from a jump")));
+        sl = makeXonoticSlider(0.45, 0.75, 0.05, "cl_bobcycle");
+        me.TD(me, 1, 1, e = makeXonoticSliderCheckBox(0, 1, sl, _("View bobbing while walking around")));
+        me.TD(me, 1, 2, sl);
+        makeMulti(e, "cl_bob2cycle");
+        makeMulti(sl, "cl_bob2cycle");
         setDependent(e, "chase_active", -1, 0);
     me.TR(me);
         me.TDempty(me, 0.2);
-        me.TD(me, 1, 2.8, e = makeXonoticCheckBoxEx(0.05, 0, "cl_smoothviewheight", _("Smooth the view while crouching")));
+        sl = makeXonoticSlider(0.5, 2, 0.1, "v_idlescale");
+        me.TD(me, 1, 1, e = makeXonoticSliderCheckBox(0, 1, sl, _("View waving while idle")));
+        me.TD(me, 1, 2, sl);
         setDependent(e, "chase_active", -1, 0);
     me.TR(me);
         me.TDempty(me, 0.2);
-        me.TD(me, 1, 2.8, e = makeXonoticCheckBoxEx(1, 0, "v_idlescale", _("View waving while idle")));
+        me.TD(me, 1, 3, e = makeXonoticCheckBoxEx(0.05, 0, "cl_bobfall", _("Smooth the view when landing from a jump")));
         setDependent(e, "chase_active", -1, 0);
     me.TR(me);
         me.TDempty(me, 0.2);
-        me.TD(me, 1, 2.8, e = makeXonoticCheckBoxEx(0.65, 0, "cl_bobcycle", _("View bobbing while walking around")));
-        makeMulti(e, "cl_bob2cycle");
+        me.TD(me, 1, 3, e = makeXonoticCheckBoxEx(0.05, 0, "cl_smoothviewheight", _("Smooth the view while crouching")));
         setDependent(e, "chase_active", -1, 0);
     me.TR(me);
     me.TR(me);
-        me.TD(me, 1, 3, e = makeXonoticRadioButton(1, "chase_active", "1", _("3rd person perspective")));
+        me.TD(me, 1, 3.2, e = makeXonoticRadioButton(1, "chase_active", "1", _("3rd person perspective")));
         makeMulti(e, "crosshair_hittest_showimpact");
     me.TR(me);
         me.TDempty(me, 0.2);
-        me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Back distance")));
+        me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Back distance")));
         setDependent(e, "chase_active", 1, 1);
-        me.TD(me, 1, 2, e = makeXonoticSlider(10, 100, 1, "chase_back"));
+        me.TD(me, 1, 2, e = makeXonoticSlider(50, 200, 1, "chase_back"));
         setDependent(e, "chase_active", 1, 1);
     me.TR(me);
         me.TDempty(me, 0.2);
-        me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Up distance")));
+        me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Up distance")));
         setDependent(e, "chase_active", 1, 1);
-        me.TD(me, 1, 2, e = makeXonoticSlider(10, 50, 1, "chase_up"));
+        me.TD(me, 1, 2, e = makeXonoticSlider(0, 50, 1, "chase_up"));
         setDependent(e, "chase_active", 1, 1);
     me.TR(me);

diff --git a/qcsrc/menu/xonotic/dialog_settings_audio.c b/qcsrc/menu/xonotic/dialog_settings_audio.c
index 8e80495..6027856 100644
--- a/qcsrc/menu/xonotic/dialog_settings_audio.c
+++ b/qcsrc/menu/xonotic/dialog_settings_audio.c
@@ -148,24 +148,6 @@ void XonoticAudioSettingsTab_fill(entity me)
         me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "snd_spatialization_control", _("Headphone friendly mode")));
         setDependent(e, "snd_channels", 1.5, 0.5);
     me.TR(me);
-    /*me.TR(me); // Samual: I REALLY don't think these are relevant to anyone, and just clutter up the menu pointlessly. The defaults are fine.
-        me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Spatial voices:")));
-        me.TD(me, 1, 2/3, e = makeXonoticRadioButton(1, "cl_voice_directional", "0", ZCTX(_("VOCS^None"))));
-        me.TD(me, 1, 2/3, e = makeXonoticRadioButton(1, "cl_voice_directional", "2", ZCTX(_("VOCS^Taunts"))));
-        me.TD(me, 1, 2/3, e = makeXonoticRadioButton(1, "cl_voice_directional", "1", ZCTX(_("VOCS^All"))));
-    me.TR(me);
-        me.TDempty(me, 0.2);
-        me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Taunt range:")));
-        setDependent(e, "cl_voice_directional", 0.5, -0.5);
-        me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_voice_directional_taunt_attenuation"));
-            e.addValue(e, ZCTX(_("RNG^Very short")), "3");
-            e.addValue(e, ZCTX(_("RNG^Short")), "2");
-            e.addValue(e, ZCTX(_("RNG^Normal")), "0.5");
-            e.addValue(e, ZCTX(_("RNG^Long")), "0.25");
-            e.addValue(e, ZCTX(_("RNG^Full")), "0.015625");
-            e.configureXonoticTextSliderValues(e);
-        setDependent(e, "cl_voice_directional", 0.5, -0.5);
-    me.TR(me);*/
     me.TR(me);
         me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_hitsound", _("Hit indication sound")));
     me.TR(me);
@@ -182,6 +164,22 @@ void XonoticAudioSettingsTab_fill(entity me)
             e.addValue(e, ZCTX(_("WRN^Both")), "3");
             e.configureXonoticTextSliderValues(e);
     me.TR(me);
+        me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Spatial voices:")));
+        me.TD(me, 1, 2/3, e = makeXonoticRadioButton(1, "cl_voice_directional", "0", ZCTX(_("VOCS^None"))));
+        me.TD(me, 1, 2/3, e = makeXonoticRadioButton(1, "cl_voice_directional", "2", ZCTX(_("VOCS^Taunts"))));
+        me.TD(me, 1, 2/3, e = makeXonoticRadioButton(1, "cl_voice_directional", "1", ZCTX(_("VOCS^All"))));
+    me.TR(me);
+        me.TDempty(me, 0.2);
+        me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Taunt range:")));
+        setDependent(e, "cl_voice_directional", 0.5, -0.5);
+        me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_voice_directional_taunt_attenuation"));
+            e.addValue(e, ZCTX(_("RNG^Very short")), "3");
+            e.addValue(e, ZCTX(_("RNG^Short")), "2");
+            e.addValue(e, ZCTX(_("RNG^Normal")), "0.5");
+            e.addValue(e, ZCTX(_("RNG^Long")), "0.25");
+            e.addValue(e, ZCTX(_("RNG^Full")), "0.015625");
+            e.configureXonoticTextSliderValues(e);
+        setDependent(e, "cl_voice_directional", 0.5, -0.5);
     me.TR(me);
         sl = makeXonoticSlider(0.15, 1, 0.05, "cl_autotaunt");
             sl.valueDisplayMultiplier = 100;
diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.c b/qcsrc/menu/xonotic/dialog_settings_effects.c
index 8ef2e9d..d446b85 100644
--- a/qcsrc/menu/xonotic/dialog_settings_effects.c
+++ b/qcsrc/menu/xonotic/dialog_settings_effects.c
@@ -71,7 +71,6 @@ void XonoticEffectsSettingsTab_fill(entity me)
             e.addValue(e, ZCTX(_("RES^Best")), "-2");
             e.configureXonoticTextSliderValues(e);
     me.TR(me);
-    me.TR(me);
         {
             // detect texture compression method
             float f;
@@ -81,20 +80,24 @@ void XonoticEffectsSettingsTab_fill(entity me)
                 case 0:
                     break;
                 case 1:
+                    me.TDempty(me, 0.2);
                     me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "r_texture_dds_load", _("Avoid lossy texture compression")));
                     break;
                 case 2:
+                    me.TDempty(me, 0.2);
                     me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "r_texture_dds_load", _("Avoid lossy texture compression")));
                         makeMulti(e, "gl_texturecompression");
                     break;
             }
         }
     me.TR(me);
-        me.TD(me, 1, 1, e = makeXonoticCheckBox(1, "mod_q3bsp_nolightmaps", _("Use lightmaps")));
-        me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "r_glsl_deluxemapping", _("Deluxe mapping")));
-            setDependentAND(e, "vid_gl20", 1, 1, "mod_q3bsp_nolightmaps", 0, 0);
-        me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "r_shadow_gloss", _("Gloss")));
-            setDependentAND3(e, "vid_gl20", 1, 1, "mod_q3bsp_nolightmaps", 0, 0, "r_glsl_deluxemapping", 1, 1);
+    me.TR(me);
+        me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "r_glsl_offsetmapping", _("Offset mapping")));
+            setDependent(e, "vid_gl20", 1, 1);
+        me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "r_glsl_offsetmapping_reliefmapping", _("Relief mapping")));
+            setDependentAND(e, "vid_gl20", 1, 1, "r_glsl_offsetmapping", 1, 1);
+        me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "r_glsl_offsetmapping_lod", _("LOD")));
+            setDependentAND(e, "vid_gl20", 1, 1, "r_glsl_offsetmapping", 1, 1);
     me.TR(me);
     me.TR(me);
         me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Particles quality:")));
@@ -128,8 +131,11 @@ void XonoticEffectsSettingsTab_fill(entity me)
             setDependent(e, "cl_decals", 1, 1);

     me.gotoRC(me, 2, 3.2); me.setFirstColumn(me, me.currentColumn);
-        me.TD(me, 1, 1.2, e = makeXonoticCheckBox(0, "r_coronas", _("Coronas")));
-        me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "r_coronas_occlusionquery", _("Use Occlusion Queries")));
+        me.TD(me, 1, 1, e = makeXonoticCheckBox(1, "mod_q3bsp_nolightmaps", _("Use lightmaps")));
+        me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "r_glsl_deluxemapping", _("Deluxe mapping")));
+            setDependentAND(e, "vid_gl20", 1, 1, "mod_q3bsp_nolightmaps", 0, 0);
+        me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "r_shadow_gloss", _("Gloss")));
+            setDependentAND3(e, "vid_gl20", 1, 1, "mod_q3bsp_nolightmaps", 0, 0, "r_glsl_deluxemapping", 1, 1);
     me.TR(me);
         me.TD(me, 1, 3, e = makeXonoticRadioButton(1, string_null, string_null, _("No dynamic lighting")));
     me.TR(me);
@@ -152,12 +158,9 @@ void XonoticEffectsSettingsTab_fill(entity me)
         if(cvar("developer"))
             me.TD(me, 1, 3, e = makeXonoticCheckBoxEx(3, 0, "r_showsurfaces", _("Show surfaces")));
     me.TR(me);
-        me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "r_glsl_offsetmapping", _("Offset mapping")));
-            setDependent(e, "vid_gl20", 1, 1);
-        me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "r_glsl_offsetmapping_reliefmapping", _("Relief mapping")));
-            setDependentAND(e, "vid_gl20", 1, 1, "r_glsl_offsetmapping", 1, 1);
-        me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "r_glsl_offsetmapping_lod", _("LOD")));
-            setDependentAND(e, "vid_gl20", 1, 1, "r_glsl_offsetmapping", 1, 1);
+    me.TR(me);
+        me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "r_coronas", _("Coronas")));
+        me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "r_coronas_occlusionquery", _("Use Occlusion Queries")));
     me.TR(me);
         me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "r_bloom", _("Bloom")));
     me.TR(me);

History

#1 Updated by MirceaKitsune about 2 years ago

  • Target version set to 0.6
  • % Done changed from 0 to 100

This is a 0.6 change. There's also another commit after this which fixes something I forgot.

#2 Updated by merlijn about 2 years ago

  • Status changed from New to In Progress
  • Assignee set to divVerent

IIRC we cannot merge this as it would break translations currently being done for 0.6.

@divVerent: can you confirm this and set the appropriate target version if it cannot be merged now?

#3 Updated by MirceaKitsune about 2 years ago

merlijn wrote:

IIRC we cannot merge this as it would break translations currently being done for 0.6.

@divVerent: can you confirm this and set the appropriate target version if it cannot be merged now?

It won't break translations. I kept the same strings for that reason, and only changed positions and re-enabled entries that were commented out and not removed from the language files.

#4 Updated by divVerent about 2 years ago

  • Target version changed from 0.6 to 1.0

Commented out entries are removed from the .pot and thus cannot be re-enabled. We really cannot merge this for 0.6. We can merge it right after 0.6 release.

#5 Updated by Samual about 2 years ago

  • Assignee changed from divVerent to Samual

I'm against a lot of this anyway, actually

Like swapping the options in effects.... it makes no sense with their new positioning, I set it up based on the relevance of each item to its surrounding items.

#6 Updated by MirceaKitsune about 2 years ago

Samual wrote:

I'm against a lot of this anyway, actually

Like swapping the options in effects.... it makes no sense with their new positioning, I set it up based on the relevance of each item to its surrounding items.

I actually thought the new swapping makes sense, since I grouped it based on categories. eg: Lightning with lightning, particles with particles, textures with textures, and so on. But if it's bad, that part can be left out or re-arranged.

#7 Updated by Samual about 2 years ago

I'm very much so against other parts of this too really, don't have time to go into detail now.

#8 Updated by divVerent about 2 years ago

Please go into detail now. I hereby start core team vote.

Now with short syntax (+ in favor, - against, 0 abstained, < needs input)

+
- Samual
0 divVerent
< mand1nga detrate Morphed tZork merlijn

#9 Updated by MirceaKitsune almost 2 years ago

Can anyone else vote on this please? I mostly care about the audio settings being put back (to select between spatial and radio voices). Also about the view bobbing slider being put back in place, since I like tweaking that and sillier settings have a slider too. The rest are cleanups I don't really care about... feel free to leave them out if you think that's best.

#10 Updated by merlijn over 1 year ago

  • Priority changed from Normal to High

I do not have a strong opinion about this, so I will have to abstain.

@Samual: Can you at least merge the suggestions that you DO like? a lot of these changes seem reasonable to me. This bug should be closed as it's been on hold for waaay too long.

#11 Updated by Samual over 1 year ago

  • Status changed from In Progress to Rejected

I actually really disagree with all of these changes, completely reject it

Also available in: Atom PDF