Merge in xonotic/xonotic-data.pk3dir.git: samual/quick_menu_updates
git-manager created issue #635 (closed) on 2011-09-02T01:19:21Z:
Purpose of the branch:
Fixes two issues --
#1: http://dev.xonotic.org/issues/625 - Temporarily fixes this issue, real solution is to auto-generate this.. but must be done after release as that's a lot of work to update the script.
#2: Adds more margin between window border on left/right side to center items better on screen.
8 margin (old): http://pics.nexuizninjaz.com/images/sb9h5kmepjjg7oa23op.jpg
16 margin (new): http://pics.nexuizninjaz.com/images/kso6qvypdxrbp31vvjq4.jpg
Repository: xonotic/xonotic-data.pk3dir.git Commit: ee590350 Branch: samual/quick_menu_updates
Merge commands:
cd data/xonotic-data.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff 'ee590350237f2a1d9acc63e043a93b20e88a861b'..'origin/samual/quick_menu_updates'
# 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/samual/quick_menu_updates'
# 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 'samual/quick_menu_updates'
Diffstat:
gfx/menu/luminos/skinvalues.txt | 4 ++--
gfx/menu/wickedx/background_ingame.tga | Bin 1098404 -> 1097881 bytes
gfx/menu/wickedx/background_l2.tga | Bin 1098404 -> 1097881 bytes
gfx/menu/wickedx/skinvalues.txt | 4 ++--
gfx/menu/xaw/skinvalues.txt | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
Revision log:
commit ee590350237f2a1d9acc63e043a93b20e88a861b
Author: Samual
Commit: Samual
Double left/right margin (from 8 to 16) in all menu skins -- This positions the items much better on screen.. Was supposed to be added much earlier but was forgotten to be committed
commit 8000c4a0db1f83e7229d44a5e6ad86067ffe3479
Author: Samual
Commit: Samual
Make the wickedx menu theme say 0.5 instead of 0.9 (NOTE, TEMPORARY FIX.. LATER NEEDS TO BE AUTOGENERATED)
User agreed to the GPLv2*.
Diff:
<pre>diff —git a/gfx/menu/luminos/skinvalues.txt b/gfx/menu/luminos/skinvalues.txt
index 21944b6..bf147b4 100755
— a/gfx/menu/luminos/skinvalues.txt
**+ b/gfx/menu/luminos/skinvalues.txt
@ -24,8 +24,8
@ MARGIN_COLORPICKER ‘0 0 0’
// uses “closebutton” images
MARGIN_TOP 8
MARGIN_BOTTOM 8
~~MARGIN_LEFT 8
~~MARGIN_RIGHT 8
*MARGIN_LEFT 16
*MARGIN_RIGHT 16
MARGIN_COLUMNS 4
MARGIN_ROWS 4
HEIGHT_DIALOGBORDER 1
diff —git a/gfx/menu/wickedx/background_ingame.tga b/gfx/menu/wickedx/background_ingame.tga
index 2532d17..20e276d 100644
Binary files a/gfx/menu/wickedx/background_ingame.tga and b/gfx/menu/wickedx/background_ingame.tga differ
diff —git a/gfx/menu/wickedx/background_l2.tga b/gfx/menu/wickedx/background_l2.tga
index 2532d17..20e276d 100644
Binary files a/gfx/menu/wickedx/background_l2.tga and b/gfx/menu/wickedx/background_l2.tga differ
diff —git a/gfx/menu/wickedx/skinvalues.txt b/gfx/menu/wickedx/skinvalues.txt
index b2b0a97..2b09e56 100755
— a/gfx/menu/wickedx/skinvalues.txt
**+ b/gfx/menu/wickedx/skinvalues.txt
@ -24,8 +24,8
@ MARGIN_COLORPICKER ‘0 0 0’
// uses “closebutton” images
MARGIN_TOP 8
MARGIN_BOTTOM 8
~~MARGIN_LEFT 8
~~MARGIN_RIGHT 8
*MARGIN_LEFT 16
*MARGIN_RIGHT 16
MARGIN_COLUMNS 4
MARGIN_ROWS 4
HEIGHT_DIALOGBORDER 1
diff —git a/gfx/menu/xaw/skinvalues.txt b/gfx/menu/xaw/skinvalues.txt
index eae123c..376f159 100644
— a/gfx/menu/xaw/skinvalues.txt
**+ b/gfx/menu/xaw/skinvalues.txt
@ -112,8 +112,8
@ COLOR_CVARLIST_UNCHANGED ‘1 1 1’
// uses “closebutton” images
MARGIN_TOP 8
MARGIN_BOTTOM 8
~~MARGIN_LEFT 8
~~MARGIN_RIGHT 8
*MARGIN_LEFT 16
+MARGIN_RIGHT 16
MARGIN_COLUMNS 4
MARGIN_ROWS 4
HEIGHT_DIALOGBORDER 1