Merge in xonotic/xonotic-data.pk3dir.git: terencehill/mutators_dialog_cleanup
git-manager created issue #1206 (closed) on 2012-05-10T16:21:33Z:
Purpose of the branch:
Change position and size of the items in the mutators dialog to avoid overlapping (clearly visible with menu_showboxes 0.3)
I also spotted and fixed this bug after the merge commit: mutators dialog not enough high to contain all the checkboxes
Repository: xonotic/xonotic-data.pk3dir.git Commit: cc8895c2 Branch: terencehill/mutators_dialog_cleanup
Merge commands:
cd data/xonotic-data.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff 'cc8895c290e5b20ea8f3d47dd6110f2f0fc7b3ac'..'origin/terencehill/mutators_dialog_cleanup'
# 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/terencehill/mutators_dialog_cleanup'
# 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 'terencehill/mutators_dialog_cleanup'
Diffstat:
.../xonotic/dialog_multiplayer_create_mutators.c | 48 ++++++++++----------
1 files changed, 24 insertions(+), 24 deletions(-)
Revision log:
commit cc8895c290e5b20ea8f3d47dd6110f2f0fc7b3ac
Merge: 50967b6 4815098
Author: terencehill
Commit: terencehill
Merge branch 'master' into terencehill/mutators_dialog_cleanup
commit 50967b631057ea1677416437a83c281eb324cdbd
Author: terencehill
Commit: terencehill
Fix mutators dialog not enough high to contain all the checkboxes
commit 834876e6b179cf33ce95102ba25faf754e9a8773
Merge: 142e56c a4ccbd7
Author: terencehill
Commit: terencehill
Merge branch 'master' into terencehill/mutators_dialog_cleanup
Conflicts:
qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
commit 142e56c24ca153c940a09572d396b520b331dc26
Author: terencehill
Commit: terencehill
Change position and size of the items in the mutators dialog to avoid overlapping (clearly visible with menu_showboxes 0.3)
User agreed to the GPLv2*.
Diff:
<pre>diff —git a/qcsrc/menu/xonotic/dialog\_multiplayer\_create\_mutators.c b/qcsrc/menu/xonotic/dialog\_multiplayer\_create\_mutators.c
index 2d64272..e412823 100644
— a/qcsrc/menu/xonotic/dialog\_multiplayer\_create\_mutators.c
**+ b/qcsrc/menu/xonotic/dialog\_multiplayer\_create\_mutators.c
@ -7,7 +7,7
@ CLASS (XonoticMutatorsDialog) EXTENDS (XonoticDialog)
ATTRIB (XonoticMutatorsDialog, title, string, \_("Mutators"))
ATTRIB (XonoticMutatorsDialog, color, vector, SKINCOLOR\_DIALOG\_MUTATORS)
ATTRIB (XonoticMutatorsDialog, intendedWidth, float, 0.9)
- ATTRIB (XonoticMutatorsDialog, rows, float, 17)
- ATTRIB (XonoticMutatorsDialog, rows, float, 19)
ATTRIB (XonoticMutatorsDialog, columns, float, 6)
ATTRIB (XonoticMutatorsDialog, refilterEntity, entity, NULL)
ENDCLASS (XonoticMutatorsDialog)
@ -197,59 +197,59
@ void XonoticMutatorsDialog_fill(entity me) me.TD (me, 1, 2, makeXonoticTextLabel(0, _("Gameplay mutators:"))); me.TR (me); me.TDempty(me, 0.2);
- me.TD (me, 1, 2, e = makeXonoticCheckBox(0, "g_dodging", _("Dodging")));
- me.TD (me, 1, 1.8, e = makeXonoticCheckBox(0, "g_dodging", _("Dodging"))); me.TR (me); me.TDempty(me, 0.2);
- me.TD (me, 1, 2, e = makeXonoticCheckBox(0, "g_cloaked", _("Cloaked")));
- me.TD (me, 1, 1.8, e = makeXonoticCheckBox(0, "g_cloaked", _("Cloaked"))); me.TR (me); me.TDempty(me, 0.2);
- me.TD (me, 1, 2, e = makeXonoticCheckBox(0, "g_midair", _("Midair")));
- me.TD (me, 1, 1.8, e = makeXonoticCheckBox(0, "g_midair", _("Midair"))); me.TR (me); me.TDempty(me, 0.2);
- me.TD (me, 1, 2, e = makeXonoticCheckBox(0, "g_vampire", _("Vampire")));
- me.TD (me, 1, 1.8, e = makeXonoticCheckBox(0, "g_vampire", _("Vampire"))); me.TR (me); me.TDempty(me, 0.2); s = makeXonoticSlider(10, 50, 1, “g_bloodloss”);
- me.TD (me, 1, 2, e = makeXonoticSliderCheckBox(0, 1, s, _("Blood loss")));
- me.TD (me, 1, 1.8, e = makeXonoticSliderCheckBox(0, 1, s, _("Blood loss"))); setDependent(e, “g_minstagib”, 0, 0); me.TR (me); me.TDempty(me, 0.4);
- me.TD (me, 1, 1.8, s);
- me.TD (me, 1, 1.6, s); me.TR (me); me.TDempty(me, 0.2); s = makeXonoticSlider(80, 400, 8, “sv_gravity”); s.valueDigits = 0; s.valueDisplayMultiplier = 0.125; // show gravity in percent
- me.TD (me, 1, 2, e = makeXonoticSliderCheckBox(800, 1, s, _("Low gravity")));
- me.TD (me, 1, 1.8, e = makeXonoticSliderCheckBox(800, 1, s, _("Low gravity"))); e.savedValue = 200; // good on silvercity me.TR (me); me.TDempty(me, 0.4);
- me.TD (me, 1, 1.8, s);
- me.TD (me, 1, 1.6, s); me.TR (me); me.TD (me, 1, 2, makeXonoticTextLabel(0, _("Weapon & item mutators:"))); me.TR (me); me.TDempty(me, 0.2);
- me.TD (me, 1, 2, e = makeXonoticCheckBox(0, "g_grappling_hook", _("Grappling hook")));
- me.TD (me, 1, 1.8, e = makeXonoticCheckBox(0, "g_grappling_hook", _("Grappling hook"))); me.TR (me); me.TDempty(me, 0.2);
- me.TD (me, 1, 2, e = makeXonoticCheckBox(0, "g_jetpack", _("Jet pack")));
- me.TD (me, 1, 1.8, e = makeXonoticCheckBox(0, "g_jetpack", _("Jet pack"))); me.TR (me); me.TDempty(me, 0.2);
- me.TD (me, 1, 2, e = makeXonoticCheckBox(0, "g_invincible_projectiles", _("Invincible Projectiles")));
- me.TD (me, 1, 1.8, e = makeXonoticCheckBox(0, "g_invincible_projectiles", _("Invincible Projectiles"))); me.TR (me); me.TDempty(me, 0.2);
- me.TD (me, 1, 2, e = makeXonoticCheckBox(0, "g_new_toys", _("New Toys")));
- me.TD (me, 1, 1.8, e = makeXonoticCheckBox(0, "g_new_toys", _("New Toys"))); setDependentWeird(e, checkCompatibility_newtoys); me.TR (me); me.TDempty(me, 0.2);
- me.TD (me, 1, 2, e = makeXonoticCheckBox(0, "g_rocket_flying", _("Rocket Flying")));
- me.TD (me, 1, 1.8, e = makeXonoticCheckBox(0, "g_rocket_flying", _("Rocket Flying"))); me.TR (me); me.TDempty(me, 0.2);
- me.TD (me, 1, 2, e = makeXonoticCheckBox(0, "g_pinata", _("Piñata")));
- me.TD (me, 1, 1.8, e = makeXonoticCheckBox(0, "g_pinata", _("Piñata"))); setDependentWeird(e, checkCompatibility_pinata); me.TR (me); me.TDempty(me, 0.2);
- me.TD (me, 1, 2, e = makeXonoticCheckBox(0, "g_weapon_stay", _("Weapons stay")));
- me.TD (me, 1, 1.8, e = makeXonoticCheckBox(0, "g_weapon_stay", _("Weapons stay"))); setDependentWeird(e, checkCompatibility_weaponstay); me.TR (me);
@ -257,7 +257,7
@ void XonoticMutatorsDialog_fill(entity me)
me.TD (me, 1, 4, makeXonoticTextLabel(0, _("Weapon arenas:")));
me.TR (me);
me.TDempty(me, 0.2);
- me.TD (me, 1, 2, e = makeXonoticRadioButton(1, string_null, string_null, _("Regular (no arena)“)));
- me.TD (me, 1, 1.8, e = makeXonoticRadioButton(1, string_null, string_null, _("Regular (no arena)”)));
for(i = WEP_FIRST, j = 0; i <= WEP_LAST; **i)
{
w = get_weaponinfo;
@ -268,7 +268,7
@ void XonoticMutatorsDialog_fill str = w.netname; hstr = w.message; me.TDempty;
- me.TD (me, 1, 2, e = makeXonoticRadioButton(1, "g_weaponarena", strzone(str), strzone));
- me.TD (me, 1, 1.8, e = makeXonoticRadioButton(1, "g_weaponarena", strzone(str), strzone));
e.cvarOffValue = “0”;
// custom load/save logic that ignores a " laser" suffix, or adds it
e.loadCvars = loadCvarsLaserWeaponArenaWeaponButton;
@ -278,7 +278,7
@ void XonoticMutatorsDialog_fill } me.TR (me); me.TDempty;
- me.TD (me, 1, 1, e = makeXonoticCheckBox(0, "menu_weaponarena_with_laser", _("with laser")));
- me.TD (me, 1, 1.8, e = makeXonoticCheckBox(0, "menu_weaponarena_with_laser", _("with laser")));
// hook the draw function to gray it out
e.draw_weaponarena = e.draw;
e.draw = preDrawLaserWeaponArenaLaserButton;
@ -289,21 +289,21
@ void XonoticMutatorsDialog_fill(entity me) me.TD (me, 1, 4, makeXonoticTextLabel(0, _("Special arenas:"))); me.TR (me); me.TDempty(me, 0.2);
- me.TD (me, 1, 2, e = makeXonoticRadioButton(1, "g_minstagib", string_null, _("MinstaGib")));
- me.TD (me, 1, 1.8, e = makeXonoticRadioButton(1, "g_minstagib", string_null, _("MinstaGib"))); me.TR (me); me.TDempty(me, 0.2);
- me.TD (me, 1, 2, e = makeXonoticRadioButton(1, "g_nix", string_null, _("NIX")));
- me.TD (me, 1, 1.8, e = makeXonoticRadioButton(1, "g_nix", string_null, _("NIX"))); me.TR (me); me.TDempty(me, 0.4);
- me.TD (me, 1, 1, e = makeXonoticCheckBox(0, "g_nix_with_laser", _("with laser")));
- me.TD (me, 1, 1.6, e = makeXonoticCheckBox(0, "g_nix_with_laser", _("with laser"))); setDependent(e, “g_nix”, 1, 1); me.TR (me); me.TDempty(me, 0.2);
- me.TD (me, 1, 2, e = makeXonoticRadioButton(1, "g_weaponarena", "most", _("Most weapons")));
- me.TD (me, 1, 1.8, e = makeXonoticRadioButton(1, "g_weaponarena", "most", _("Most weapons"))); e.cvarOffValue = “0”; me.TR (me); me.TDempty(me, 0.2);
- me.TD (me, 1, 2, e = makeXonoticRadioButton(1, "g_start_weapon_laser", "0", _("No start weapons")));
- me.TD (me, 1, 1.8, e = makeXonoticRadioButton(1, "g_start_weapon_laser", "0", _("No start weapons"))); e.cvarOffValue = “–1”; makeMulti(e, “g_start_weapon_shotgun g_start_weapon_uzi g_start_weapon_grenadelauncher g_start_weapon_minelayer g_start_weapon_electro g_start_weapon_crylink g_start_weapon_nex g_start_weapon_hagar g_start_weapon_rocketlauncher g_start_weapon_rifle g_start_weapon_hlac g_start_weapon_seeker g_start_weapon_minstanex g_start_weapon_hook g_start_weapon_porto g_start_weapon_tuba g_start_weapon_minelayer”);