summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ui/ingame_options.menu89
-rw-r--r--ui/tremulous_alienbuild.menu2
-rw-r--r--ui/tremulous_alienclass.menu4
-rw-r--r--ui/tremulous_alienupgrade.menu2
-rw-r--r--ui/tremulous_humanbuild.menu2
-rw-r--r--ui/tremulous_humanitem.menu4
-rw-r--r--ui/tremulous_teamselect.menu2
7 files changed, 34 insertions, 71 deletions
diff --git a/ui/ingame_options.menu b/ui/ingame_options.menu
index 469d7f76..88c3cbf2 100644
--- a/ui/ingame_options.menu
+++ b/ui/ingame_options.menu
@@ -272,8 +272,6 @@
textscale .25
forecolor 1 1 1 1
visible 0
- mouseenter { show keyBindStatus }
- mouseexit { hide keyBindStatus }
}
itemDef
@@ -291,8 +289,6 @@
textscale .25
forecolor 1 1 1 1
visible 0
- mouseenter { show keyBindStatus }
- mouseexit { hide keyBindStatus }
}
itemDef
@@ -310,8 +306,6 @@
textscale .25
forecolor 1 1 1 1
visible 0
- mouseenter { show keyBindStatus }
- mouseexit { hide keyBindStatus }
}
itemDef
@@ -329,8 +323,6 @@
textscale .25
forecolor 1 1 1 1
visible 0
- mouseenter { show keyBindStatus }
- mouseexit { hide keyBindStatus }
}
itemDef
@@ -348,8 +340,6 @@
textscale .25
forecolor 1 1 1 1
visible 0
- mouseenter { show keyBindStatus }
- mouseexit { hide keyBindStatus }
}
itemDef
@@ -521,8 +511,6 @@
textscale .25
forecolor 1 1 1 1
visible 0
- mouseenter { show keyBindStatus }
- mouseexit { hide keyBindStatus }
}
itemDef
@@ -540,8 +528,6 @@
textscale .25
forecolor 1 1 1 1
visible 0
- mouseenter { show keyBindStatus }
- mouseexit { hide keyBindStatus }
}
itemDef
@@ -559,8 +545,6 @@
textscale .25
forecolor 1 1 1 1
visible 0
- mouseenter { show keyBindStatus }
- mouseexit { hide keyBindStatus }
}
itemDef
@@ -578,8 +562,6 @@
textscale .25
forecolor 1 1 1 1
visible 0
- mouseenter { show keyBindStatus }
- mouseexit { hide keyBindStatus }
}
itemDef
@@ -597,8 +579,6 @@
textscale .25
forecolor 1 1 1 1
visible 0
- mouseenter { show keyBindStatus }
- mouseexit { hide keyBindStatus }
}
itemDef
@@ -616,8 +596,6 @@
textscale .25
forecolor 1 1 1 1
visible 0
- mouseenter { show keyBindStatus }
- mouseexit { hide keyBindStatus }
}
itemDef
@@ -635,8 +613,6 @@
textscale .25
forecolor 1 1 1 1
visible 0
- mouseenter { show keyBindStatus }
- mouseexit { hide keyBindStatus }
}
itemDef
@@ -654,8 +630,6 @@
textscale .25
forecolor 1 1 1 1
visible 0
- mouseenter { show keyBindStatus }
- mouseexit { hide keyBindStatus }
}
itemDef
@@ -673,8 +647,6 @@
textscale .25
forecolor 1 1 1 1
visible 0
- mouseenter { show keyBindStatus }
- mouseexit { hide keyBindStatus }
}
@@ -718,8 +690,6 @@
textscale .25
forecolor 1 1 1 1
visible 0
- mouseenter { show keyBindStatus }
- mouseexit { hide keyBindStatus }
}
itemDef
@@ -737,8 +707,6 @@
textscale .25
forecolor 1 1 1 1
visible 0
- mouseenter { show keyBindStatus }
- mouseexit { hide keyBindStatus }
}
itemDef
@@ -756,8 +724,6 @@
textscale .25
forecolor 1 1 1 1
visible 0
- mouseenter { show keyBindStatus }
- mouseexit { hide keyBindStatus }
}
itemDef
@@ -775,8 +741,6 @@
textscale .25
forecolor 1 1 1 1
visible 0
- mouseenter { show keyBindStatus }
- mouseexit { hide keyBindStatus }
}
itemDef
@@ -794,8 +758,6 @@
textscale .25
forecolor 1 1 1 1
visible 0
- mouseenter { show keyBindStatus }
- mouseexit { hide keyBindStatus }
}
//////// MISC
@@ -829,7 +791,7 @@
type ITEM_TYPE_BIND
text "Show Scores:"
cvar "+scores"
- rect 96 85 192 15
+ rect 96 80 192 15
textalign ITEM_ALIGN_RIGHT
textalignx 90
maxPaintChars 20
@@ -837,8 +799,6 @@
textscale .25
forecolor 1 1 1 1
visible 0
- mouseenter { show keyBindStatus }
- mouseexit { hide keyBindStatus }
}
itemDef
@@ -848,7 +808,7 @@
type ITEM_TYPE_BIND
text "Scroll Scores Up:"
cvar "scoresUp"
- rect 96 100 192 15
+ rect 96 95 192 15
textalign ITEM_ALIGN_RIGHT
textalignx 90
maxPaintChars 20
@@ -856,8 +816,6 @@
textscale .25
forecolor 1 1 1 1
visible 0
- mouseenter { show keyBindStatus }
- mouseexit { hide keyBindStatus }
}
itemDef
@@ -867,7 +825,7 @@
type ITEM_TYPE_BIND
text "Scroll Scores Down:"
cvar "scoresDown"
- rect 96 115 192 15
+ rect 96 110 192 15
textalign ITEM_ALIGN_RIGHT
textalignx 90
maxPaintChars 20
@@ -875,8 +833,6 @@
textscale .25
forecolor 1 1 1 1
visible 0
- mouseenter { show keyBindStatus }
- mouseexit { hide keyBindStatus }
}
itemDef
@@ -886,7 +842,24 @@
type ITEM_TYPE_BIND
text "Use Object:"
cvar "+button7"
- rect 96 130 192 15
+ rect 96 125 192 15
+ textalign ITEM_ALIGN_RIGHT
+ textalignx 90
+ maxPaintChars 20
+ textaligny 12
+ textscale .25
+ forecolor 1 1 1 1
+ visible 0
+ }
+
+ itemDef
+ {
+ name misc
+ group optionsGrp
+ type ITEM_TYPE_BIND
+ text "Deconstruct Object:"
+ cvar "deconstruct"
+ rect 96 140 192 15
textalign ITEM_ALIGN_RIGHT
textalignx 90
maxPaintChars 20
@@ -894,8 +867,6 @@
textscale .25
forecolor 1 1 1 1
visible 0
- mouseenter { show keyBindStatus }
- mouseexit { hide keyBindStatus }
}
itemDef
@@ -905,7 +876,7 @@
type ITEM_TYPE_BIND
text "Gesture:"
cvar "+button3"
- rect 96 145 192 15
+ rect 96 155 192 15
textalign ITEM_ALIGN_RIGHT
textalignx 90
maxPaintChars 20
@@ -913,8 +884,6 @@
textscale .25
forecolor 1 1 1 1
visible 0
- mouseenter { show keyBindStatus }
- mouseexit { hide keyBindStatus }
}
itemDef
@@ -924,7 +893,7 @@
type ITEM_TYPE_BIND
text "Chat:"
cvar "messagemode"
- rect 96 160 192 15
+ rect 96 170 192 15
textalign ITEM_ALIGN_RIGHT
textalignx 90
maxPaintChars 20
@@ -932,8 +901,6 @@
textscale .25
forecolor 1 1 1 1
visible 0
- mouseenter { show keyBindStatus }
- mouseexit { hide keyBindStatus }
}
itemDef
@@ -943,7 +910,7 @@
type ITEM_TYPE_BIND
text "Team Chat:"
cvar "messagemode2"
- rect 96 175 192 15
+ rect 96 185 192 15
textalign ITEM_ALIGN_RIGHT
textalignx 90
maxPaintChars 20
@@ -951,8 +918,6 @@
textscale .25
forecolor 1 1 1 1
visible 0
- mouseenter { show keyBindStatus }
- mouseexit { hide keyBindStatus }
}
itemDef
@@ -962,7 +927,7 @@
type ITEM_TYPE_BIND
text "Target Chat (FIXME):"
cvar "messagemode3"
- rect 96 190 192 15
+ rect 96 200 192 15
textalign ITEM_ALIGN_RIGHT
textalignx 90
maxPaintChars 20
@@ -979,7 +944,7 @@
type ITEM_TYPE_BIND
text "Attack Chat (FIXME):"
cvar "messagemode4"
- rect 96 205 192 15
+ rect 96 215 192 15
textalign ITEM_ALIGN_RIGHT
textalignx 90
maxPaintChars 20
@@ -987,8 +952,6 @@
textscale .25
forecolor 1 1 1 1
visible 0
- mouseenter { show keyBindStatus }
- mouseexit { hide keyBindStatus }
}
//////// SYSTEM
diff --git a/ui/tremulous_alienbuild.menu b/ui/tremulous_alienbuild.menu
index a76d307b..3845ff40 100644
--- a/ui/tremulous_alienbuild.menu
+++ b/ui/tremulous_alienbuild.menu
@@ -88,7 +88,7 @@
text "Cancel"
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
- rect 344 218 34 21
+ rect 344 218 50 21
textalign ITEM_ALIGN_LEFT
textalignx 3.8
textaligny 18
diff --git a/ui/tremulous_alienclass.menu b/ui/tremulous_alienclass.menu
index fd9c7bc9..d8e5b8fb 100644
--- a/ui/tremulous_alienclass.menu
+++ b/ui/tremulous_alienclass.menu
@@ -71,7 +71,7 @@
text "< Back"
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
- rect 152 218 34 21
+ rect 152 218 50 21
textalign ITEM_ALIGN_LEFT
textalignx 3
textaligny 18
@@ -105,7 +105,7 @@
text "Cancel"
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
- rect 344 218 34 21
+ rect 344 218 50 21
textalign ITEM_ALIGN_LEFT
textalignx 3.8
textaligny 18
diff --git a/ui/tremulous_alienupgrade.menu b/ui/tremulous_alienupgrade.menu
index 01d35ff4..5e24863f 100644
--- a/ui/tremulous_alienupgrade.menu
+++ b/ui/tremulous_alienupgrade.menu
@@ -88,7 +88,7 @@
text "Cancel"
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
- rect 344 218 34 21
+ rect 344 218 50 21
textalign ITEM_ALIGN_LEFT
textalignx 3.8
textaligny 18
diff --git a/ui/tremulous_humanbuild.menu b/ui/tremulous_humanbuild.menu
index ec3ef5e2..ee573dc5 100644
--- a/ui/tremulous_humanbuild.menu
+++ b/ui/tremulous_humanbuild.menu
@@ -87,7 +87,7 @@
text "Cancel"
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
- rect 344 218 34 21
+ rect 344 218 50 21
textalign ITEM_ALIGN_LEFT
textalignx 3.8
textaligny 18
diff --git a/ui/tremulous_humanitem.menu b/ui/tremulous_humanitem.menu
index 24a65b73..5c317cd3 100644
--- a/ui/tremulous_humanitem.menu
+++ b/ui/tremulous_humanitem.menu
@@ -71,7 +71,7 @@
text "< Back"
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
- rect 152 218 34 21
+ rect 152 218 50 21
textalign ITEM_ALIGN_LEFT
textalignx 3
textaligny 18
@@ -105,7 +105,7 @@
text "Cancel"
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
- rect 344 218 34 21
+ rect 344 218 50 21
textalign ITEM_ALIGN_LEFT
textalignx 3.8
textaligny 18
diff --git a/ui/tremulous_teamselect.menu b/ui/tremulous_teamselect.menu
index c7833623..a38a4a1c 100644
--- a/ui/tremulous_teamselect.menu
+++ b/ui/tremulous_teamselect.menu
@@ -88,7 +88,7 @@
text "Cancel"
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
- rect 344 218 34 21
+ rect 344 218 50 21
textalign ITEM_ALIGN_LEFT
textalignx 3.8
textaligny 18