teambeef
/
ioq3quest
mirror of https://github.com/DrBeef/ioq3quest.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/DrBeef/ioq3quest

This commit is contained in:
Simon 2022-03-13 19:04:00 +00:00
parent ce6e74ed0f 4ddf58d037
commit 64132b114b
8 changed files with 37 additions and 438 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/app/src/main/assets/pakQ3Q.pk3
View File

Binary file not shown.

2
android/app/src/main/pakQ3Q/ui/comfort.menu
View File

@ -86,7 +86,7 @@ itemDef {
group grpComfort group grpComfort
type ITEM_TYPE_SLIDER type ITEM_TYPE_SLIDER
text "Haptic Intensity:" text "Haptic Intensity:"
cvarfloat "vr_hudYOffset" 0.2 0 1 cvarfloat "vr_hapticIntensity" 0.2 0 1
rect 99 225 256 20 rect 99 225 256 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 128 textalignx 128

2
android/app/src/main/pakQ3Q/ui/controls3.menu
View File

@ -149,7 +149,7 @@ itemDef {
type ITEM_TYPE_MULTI type ITEM_TYPE_MULTI
text "Weapon Selector Mode:" text "Weapon Selector Mode:"
cvar "vr_weaponSelectorMode" cvar "vr_weaponSelectorMode"
cvarFloatList { "Controller Weapon Selector" 0 "HMD Weapon Wheel" 1 "Alt-Key Bindings" 2 "Thumbstick Forward/Back" 3 } cvarFloatList { "Controller Weapon Selector" 0 "HMD Weapon Wheel" 1 }
rect 99 300 256 20 rect 99 300 256 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 128 textalignx 128

382
android/app/src/main/pakQ3Q/ui/ingame.menu
View File

@ -1,382 +0,0 @@
#include "ui/menudef.h"
{
assetGlobalDef {
font "fonts/font" 16 // font
smallFont "fonts/smallfont" 12 // font
bigFont "fonts/bigfont" 20 // font
cursor "ui/assets/3_cursor3" // cursor
gradientBar "ui/assets/gradientbar2.tga" // gradient bar
itemFocusSound "sound/misc/menu2.wav" // sound for item getting focus (via keyboard or mouse )
fadeClamp 1.0 // sets the fadeup alpha
fadeCycle 1 // how often fade happens in milliseconds
fadeAmount 0.1 // amount to adjust alpha per cycle
shadowColor 0.1 0.1 0.1 0.25 // shadow color
}
\\ INGAME MENU \\
menuDef {
name "ingame"
visible 0
fullScreen 0
outOfBoundsClick // this closes the window if it gets a click out of the rectangle
rect 0 0 640 480
focusColor 1 .75 0 1
disableColor .5 .5 .5 1
itemDef {
name "ingameRect"
visible 1
rect 0 0 620 26
style 0
border 1
bordercolor .5 .5 .5 1
forecolor 1 1 1 1
backcolor 0 0 .75 .5
visible 1
decoration
}
itemdef
{
name about
text "About"
rect 5 0 53 30
type 1
style WINDOW_STYLE_FILLED
background "ui/assets/button_back.tga"
textalign 1
textalignx 27
textaligny 22
textscale .25
forecolor 1 1 1 1
backcolor .0 .17 .0 1
visible 1
action { open ingame_about }
mouseEnter { setitemcolor about backcolor .1 .37 .1 1 }
mouseExit { setitemcolor about backcolor .0 .17 .0 1 }
}
itemdef
{
name aboutframe
style 3
rect 0 0 58 32
background "ui/assets/ingameframea.tga"
visible 1
decoration
}
itemDef {
name join
text "Join"
type 1
style WINDOW_STYLE_FILLED
background "ui/assets/button_back.tga"
cvarTest "ui_singleplayeractive"
disableCvar { "1" }
rect 58 0 58 30
textalign 1
textalignx 29
textaligny 22
textscale .25
forecolor 1 1 1 1
backcolor 0 .17 0 1
visible 1
action { open ingame_join }
mouseEnter { setitemcolor join backcolor .1 .37 .1 1 }
mouseExit { setitemcolor join backcolor 0 .17 0 1 }
}
itemdef
{
name joinframe
style 3
rect 58 0 58 32
background "ui/assets/ingameframe.tga"
visible 1
decoration
}
itemDef {
name orders
text "Orders"
type 1
style WINDOW_STYLE_FILLED
background "ui/assets/button_back.tga"
rect 116 0 58 30
textalign 1
textalignx 29
textaligny 22
textscale .25
cvarTest "g_gametype"
disableCvar { "0" ; "1" ; "2" ; "3" ; "8" }
visible 1
forecolor 1 1 1 1
backcolor 0 .17 0 1
action { open ingame_orders }
mouseEnter { setitemcolor orders backcolor .1 .37 .1 1 }
mouseExit { setitemcolor orders backcolor 0 .17 0 1 }
}
itemdef
{
name ordersframe
style 3
rect 116 0 58 32
background "ui/assets/ingameframe.tga"
visible 1
decoration
}
itemDef {
name addBot
text "Add Bot"
type 1
style WINDOW_STYLE_FILLED
background "ui/assets/button_back.tga"
rect 174 0 58 30
textalign 1
textalignx 29
textaligny 22
textscale .25
cvarTest "ui_singleplayeractive"
disableCvar { "1" }
forecolor 1 1 1 1
backcolor 0 .17 0 1
visible 1
action { open ingame_addbot }
mouseEnter { setitemcolor addBot backcolor .1 .37 .1 1 }
mouseExit { setitemcolor addBot backcolor 0 .17 0 1 }
}
itemdef
{
name addBotframe
style 3
rect 174 0 58 32
background "ui/assets/ingameframe.tga"
visible 1
decoration
}
itemDef {
name player
text "Player"
type 1
style WINDOW_STYLE_FILLED
background "ui/assets/button_back.tga"
rect 232 0 58 30
textalign 1
textalignx 29
textaligny 22
textscale .25
forecolor 1 1 1 1
backcolor 0 .17 0 1
visible 1
action { open ingame_player }
mouseEnter { setitemcolor player backcolor .1 .37 .1 1 }
mouseExit { setitemcolor player backcolor 0 .17 0 1 }
}
itemdef
{
name playerframe
style 3
rect 232 0 58 32
textalign 1
background "ui/assets/ingameframe.tga"
visible 1
decoration
}
itemDef {
name controls3
text "Controls"
type 1
style WINDOW_STYLE_FILLED
background "ui/assets/button_back.tga"
rect 290 0 58 30
textalign 1
textalignx 29
textaligny 22
textscale .25
forecolor 1 1 1 1
backcolor 0 .17 0 1
visible 1
action { open ingame_controls3 }
mouseEnter { setitemcolor controls3 backcolor .1 .37 .1 1 }
mouseExit { setitemcolor controls3 backcolor 0 .17 0 1 }
}
itemdef
{
name controlsframe
style 3
rect 290 0 58 32
textalign 1
background "ui/assets/ingameframe.tga"
visible 1
decoration
}
itemDef {
name options
text "Options"
type 1
style WINDOW_STYLE_FILLED
background "ui/assets/button_back.tga"
rect 348 0 58 30
textalign 1
textalignx 29
textaligny 22
textscale .25
forecolor 1 1 1 1
backcolor 0 .17 0 1
visible 1
action { open ingame_options }
mouseEnter { setitemcolor options backcolor .1 .37 .1 1 }
mouseExit { setitemcolor options backcolor 0 .17 0 1 }
}
itemdef
{
name optionsframe
style 3
rect 348 0 58 32
textalign 1
background "ui/assets/ingameframe.tga"
visible 1
decoration
}
itemDef {
name system
text "System"
type 1
style WINDOW_STYLE_FILLED
background "ui/assets/button_back.tga"
rect 406 0 58 30
textalign 1
textalignx 29
textaligny 22
textscale .25
forecolor 1 1 1 1
backcolor 0 .17 0 1
visible 1
action { open ingame_system }
mouseEnter { setitemcolor system backcolor .1 .37 .1 1 }
mouseExit { setitemcolor system backcolor 0 .17 0 1 }
}
itemdef
{
name systemframe
style 3
rect 406 0 58 32
textalign 1
background "ui/assets/ingameframe.tga"
visible 1
decoration
}
itemDef {
name vote
text "Vote"
type 1
style WINDOW_STYLE_FILLED
background "ui/assets/button_back.tga"
cvarTest "ui_singleplayeractive"
disableCvar { "1" }
rect 464 0 58 30
textalign 1
textalignx 29
textaligny 22
textscale .25
forecolor 1 1 1 1
backcolor 0 .17 0 1
visible 1
action { open ingame_vote }
mouseEnter { setitemcolor vote backcolor .1 .37 .1 1 }
mouseExit { setitemcolor vote backcolor 0 .17 0 1 }
}
itemdef
{
name voteframe
style 3
rect 464 0 58 32
textalign 1
background "ui/assets/ingameframe.tga"
visible 1
decoration
}
itemDef {
name callvote
text "CallVote"
type 1
style WINDOW_STYLE_FILLED
background "ui/assets/button_back.tga"
cvarTest "ui_singleplayeractive"
disableCvar { "1" }
rect 522 0 58 30
textalign 1
textalignx 29
textaligny 22
textscale .25
forecolor 1 1 1 1
backcolor 0 .17 0 1
visible 1
action { open ingame_callvote }
mouseEnter { setitemcolor callvote backcolor .1 .37 .1 1 }
mouseExit { setitemcolor callvote backcolor 0 .17 0 1 }
}
itemdef
{
name callvoteframe
style 3
rect 522 0 58 32
textalign 1
background "ui/assets/ingameframe.tga"
visible 1
decoration
}
itemDef {
name leave
text "Exit"
type 1
style WINDOW_STYLE_FILLED
background "ui/assets/button_back.tga"
rect 580 0 58 30
textalign 1
textalignx 29
textaligny 22
textscale .25
forecolor 1 1 1 1
backcolor 0 .17 0 1
visible 1
action { open ingame_leave }
mouseEnter { setitemcolor leave backcolor .1 .37 .1 1 }
mouseExit { setitemcolor leave backcolor 0 .17 0 1 }
}
itemdef
{
name leave
style 3
rect 580 0 58 32
textalign 1
background "ui/assets/ingameframe.tga"
visible 1
decoration
}
}
}

17
android/app/src/main/pakQ3Q/ui/ingame.txt
View File

@ -1,17 +0,0 @@
// menu defs
//
{
loadMenu { "ui/ingame.menu" }
loadMenu { "ui/ingame_vote.menu" }
loadMenu { "ui/ingame_about.menu" }
loadMenu { "ui/ingame_controls.menu" }
loadMenu { "ui/ingame_controls3.menu" }
loadMenu { "ui/ingame_join.menu" }
loadMenu { "ui/ingame_options.menu" }
loadMenu { "ui/ingame_system.menu" }
loadMenu { "ui/ingame_leave.menu" }
loadMenu { "ui/ingame_player.menu" }
loadMenu { "ui/ingame_addbot.menu" }
loadMenu { "ui/ingame_callvote.menu" }
loadMenu { "ui/ingame_orders.menu" }
}

66
android/app/src/main/pakQ3Q/ui/ingame_controls3.menu → android/app/src/main/pakQ3Q/ui/ingame_controls.menu
View File

@ -4,7 +4,7 @@
\\ SETUP MENU \\ \\ SETUP MENU \\
menuDef { menuDef {
name "ingame_controls3" name "ingame_controls"
visible 0 visible 0
fullscreen 0 fullscreen 0
outOfBoundsClick // this closes the window if it gets a click out of the rectangle outOfBoundsClick // this closes the window if it gets a click out of the rectangle
@ -160,8 +160,8 @@ itemDef {
itemDef { itemDef {
name controls3 name controls
group grpControls3 group grpControls
type ITEM_TYPE_YESNO type ITEM_TYPE_YESNO
text "Autoswitch Weapons:" text "Autoswitch Weapons:"
cvar "cg_autoswitch" cvar "cg_autoswitch"
@ -175,8 +175,8 @@ itemDef {
} }
itemDef { itemDef {
name controls3 name controls
group grpControls3 group grpControls
type ITEM_TYPE_YESNO type ITEM_TYPE_YESNO
text "Railgun Scope:" text "Railgun Scope:"
cvar "vr_weaponScope" cvar "vr_weaponScope"
@ -189,8 +189,8 @@ itemDef {
visible 1 visible 1
} }
itemDef { itemDef {
name controls3 name controls
group grpControls3 group grpControls
type ITEM_TYPE_YESNO type ITEM_TYPE_YESNO
text "Two-Handed Weapons:" text "Two-Handed Weapons:"
cvar "vr_twoHandedWeapons" cvar "vr_twoHandedWeapons"
@ -204,8 +204,8 @@ itemDef {
} }
itemDef { itemDef {
name controls3 name controls
group grpControls3 group grpControls
type ITEM_TYPE_MULTI type ITEM_TYPE_MULTI
text "Direction Mode:" text "Direction Mode:"
cvar "vr_directionMode" cvar "vr_directionMode"
@ -220,8 +220,8 @@ itemDef {
} }
itemDef { itemDef {
name controls3 name controls
group grpControls3 group grpControls
text "Turning Mode:" text "Turning Mode:"
cvar "vr_snapturn" cvar "vr_snapturn"
cvarFloatList { "Smooth Turning" 0 "45 Degrees" 45 "90 Degrees" 90 } cvarFloatList { "Smooth Turning" 0 "45 Degrees" 45 "90 Degrees" 90 }
@ -235,8 +235,8 @@ itemDef {
} }
itemDef { itemDef {
name controls3 name controls
group grpControls3 group grpControls
type ITEM_TYPE_YESNO type ITEM_TYPE_YESNO
text "Right-Handed:" text "Right-Handed:"
cvar "vr_righthanded" cvar "vr_righthanded"
@ -250,8 +250,8 @@ itemDef {
} }
itemDef { itemDef {
name controls3 name controls
group grpControls3 group grpControls
type ITEM_TYPE_SLIDER type ITEM_TYPE_SLIDER
text "Weapon Pitch:" text "Weapon Pitch:"
cvarfloat "vr_weaponPitch" 5 -25 5 cvarfloat "vr_weaponPitch" 5 -25 5
@ -265,12 +265,12 @@ itemDef {
} }
itemDef { itemDef {
name controls3 name controls
group grpControls3 group grpControls
type ITEM_TYPE_MULTI type ITEM_TYPE_MULTI
text "Weapon Selector Mode:" text "Weapon Selector Mode:"
cvar "vr_weaponSelectorMode" cvar "vr_weaponSelectorMode"
cvarFloatList { "Controller Weapon Selector" 0 "HMD Weapon Wheel" 1 "Alt-Key Bindings" 2 "Thumbstick Forward/Back" 3 } cvarFloatList { "Controller Weapon Selector" 0 "HMD Weapon Wheel" 1 }
rect 30 160 200 20 rect 30 160 200 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 143 textalignx 143
@ -281,8 +281,8 @@ itemDef {
} }
itemDef { itemDef {
name controls3 name controls
group grpControls3 group grpControls
style 1 style 1
text "Comfort Options" text "Comfort Options"
rect 100 195 100 20 rect 100 195 100 20
@ -295,8 +295,8 @@ itemDef {
} }
itemDef { itemDef {
name controls3 name controls
group grpControls3 group grpControls
type ITEM_TYPE_SLIDER type ITEM_TYPE_SLIDER
text "Comfort Vignette:" text "Comfort Vignette:"
cvarfloat "vr_comfortVignette" 0.2 0 1 cvarfloat "vr_comfortVignette" 0.2 0 1
@ -309,8 +309,8 @@ itemDef {
visible 1 visible 1
} }
itemDef { itemDef {
name controls3 name controls
group grpControls3 group grpControls
type ITEM_TYPE_SLIDER type ITEM_TYPE_SLIDER
text "Height Adjust:" text "Height Adjust:"
cvarfloat "vr_heightAdjust" 0.2 0 1 cvarfloat "vr_heightAdjust" 0.2 0 1
@ -323,8 +323,8 @@ itemDef {
visible 1 visible 1
} }
itemDef { itemDef {
name controls3 name controls
group grpControls3 group grpControls
type ITEM_TYPE_YESNO type ITEM_TYPE_YESNO
text "Roll When Hit:" text "Roll When Hit:"
cvar "vr_rollWhenHit" cvar "vr_rollWhenHit"
@ -337,11 +337,11 @@ itemDef {
visible 1 visible 1
} }
itemDef { itemDef {
name controls3 name controls
group grpControls3 group grpControls
type ITEM_TYPE_SLIDER type ITEM_TYPE_SLIDER
text "Haptic Intensity:" text "Haptic Intensity:"
cvarfloat "vr_hudYOffset" 0.2 0 1 cvarfloat "vr_hapticIntensity" 0.2 0 1
rect 30 280 200 20 rect 30 280 200 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 143 textalignx 143
@ -351,8 +351,8 @@ itemDef {
visible 1 visible 1
} }
itemDef { itemDef {
name controls3 name controls
group grpControls3 group grpControls
type ITEM_TYPE_MULTI type ITEM_TYPE_MULTI
text "HUD Depth:" text "HUD Depth:"
cvar "vr_hudDepth" cvar "vr_hudDepth"
@ -366,8 +366,8 @@ itemDef {
visible 1 visible 1
} }
itemDef { itemDef {
name controls3 name controls
group grpControls3 group grpControls
type ITEM_TYPE_SLIDER type ITEM_TYPE_SLIDER
text "HUD Y Offset:" text "HUD Y Offset:"
cvarfloat "vr_hudYOffset" 20 -200 200 cvarfloat "vr_hudYOffset" 20 -200 200

3
android/app/src/main/pakQ3Q/ui/ingame_system.menu
View File

@ -201,7 +201,7 @@ itemDef {
type ITEM_TYPE_MULTI type ITEM_TYPE_MULTI
text "Refresh Rate:" text "Refresh Rate:"
cvar "vr_refreshrate" cvar "vr_refreshrate"
cvarFloatList { "60" 0 "72 (Default)" 1 "80" 2 "90" 3 } cvarFloatList { "60" 60 "72 (Default)" 72 "80" 80 "90" 90 }
rect 0 70 256 20 rect 0 70 256 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 133 textalignx 133
@ -210,7 +210,6 @@ itemDef {
forecolor 1 1 1 1 forecolor 1 1 1 1
visible 0 visible 0
decoration decoration
action { uiScript update "vr_refreshrate" }
} }
itemDef { itemDef {

3
android/app/src/main/pakQ3Q/ui/system.menu
View File

@ -105,7 +105,7 @@ itemDef {
type ITEM_TYPE_MULTI type ITEM_TYPE_MULTI
text "Refresh Rate:" text "Refresh Rate:"
cvar "vr_refreshrate" cvar "vr_refreshrate"
cvarFloatList { "60" 0 "72 (Default)" 1 "80" 2 "90" 3 } cvarFloatList { "60" 60 "72 (Default)" 72 "80" 80 "90" 90 }
rect 99 67 256 20 rect 99 67 256 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 128 textalignx 128
@ -113,7 +113,6 @@ itemDef {
textscale .333 textscale .333
forecolor 1 1 1 1 forecolor 1 1 1 1
visible 0 visible 0
action { uiScript update "vr_refreshrate" }
} }
itemDef { itemDef {