Skip to content

Commit

Permalink
Merge branch 'main' into fix-density
Browse files Browse the repository at this point in the history
  • Loading branch information
mafewtm authored Oct 29, 2024
2 parents 8299db6 + d946f5a commit 6913693
Show file tree
Hide file tree
Showing 6 changed files with 218 additions and 28 deletions.
1 change: 1 addition & 0 deletions .github/workflows/release-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ jobs:
- name: Update CHANGELOG
id: changelog
uses: requarks/changelog-action@v1
continue-on-error: true
with:
token: ${{ steps.generate_token.outputs.token }}
tag: ${{ github.ref_name }}
Expand Down
38 changes: 30 additions & 8 deletions qbox-lean.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ tasks:
src: ./tmp/qbox/ox.cfg
dest: ./ox.cfg

- action: move_path
src: ./tmp/qbox/voice.cfg
dest: ./voice.cfg

- action: move_path
src: ./tmp/qbox/myLogo.png
dest: ./myLogo.png
Expand Down Expand Up @@ -162,10 +166,12 @@ tasks:
ref: main
src: https://github.com/qbox-project/qbx_scoreboard

- action: download_github
dest: ./resources/[qbx]/qbx_adminmenu
ref: main
src: https://github.com/qbox-project/qbx_adminmenu
- action: download_file
path: ./tmp/qbx_adminmenu.zip
url: https://github.com/qbox-project/qbx_adminmenu/releases/latest/download/qbx_adminmenu.zip
- action: unzip
dest: ./resources/[qbx]
src: ./tmp/qbx_adminmenu.zip

- action: waste_time # prevent github throttling
seconds: 10
Expand All @@ -177,10 +183,12 @@ tasks:
- action: query_database
file: ./resources/[qbx]/qbx_vehicleshop/vehshop.sql

- action: download_github
dest: ./resources/[qbx]/qbx_hud
ref: main
src: https://github.com/qbox-project/qbx_hud
- action: download_file
path: ./tmp/qbx_hud.zip
url: https://github.com/qbox-project/qbx_hud/releases/latest/download/qbx_hud.zip
- action: unzip
dest: ./resources/[qbx]
src: ./tmp/qbx_hud.zip

- action: download_github
dest: ./resources/[qbx]/qbx_seatbelt
Expand Down Expand Up @@ -271,6 +279,20 @@ tasks:
ref: main
src: https://github.com/qbox-project/qbx_cityhall

- action: download_file
path: ./tmp/qbx_spawn.zip
url: https://github.com/qbox-project/qbx_spawn/releases/latest/download/qbx_spawn.zip
- action: unzip
dest: ./resources/[qbx]
src: ./tmp/qbx_spawn.zip

- action: download_file
path: ./tmp/qbx_customs.zip
url: https://github.com/qbox-project/qbx_customs/releases/latest/download/qbx_customs.zip
- action: unzip
dest: ./resources/[qbx]
src: ./tmp/qbx_customs.zip

- action: waste_time # prevent github throttling
seconds: 10

Expand Down
30 changes: 29 additions & 1 deletion qbox-stable.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,34 @@ tasks:
dest: ./resources/[qbx]
src: ./tmp/qbx_density.zip

- action: download_file
path: ./tmp/qbx_adminmenu.zip
url: https://github.com/qbox-project/qbx_adminmenu/releases/latest/download/qbx_adminmenu.zip
- action: unzip
dest: ./resources/[qbx]
src: ./tmp/qbx_adminmenu.zip

- action: download_file
path: ./tmp/qbx_hud.zip
url: https://github.com/qbox-project/qbx_hud/releases/latest/download/qbx_hud.zip
- action: unzip
dest: ./resources/[qbx]
src: ./tmp/qbx_hud.zip

- action: download_file
path: ./tmp/qbx_spawn.zip
url: https://github.com/qbox-project/qbx_spawn/releases/latest/download/qbx_spawn.zip
- action: unzip
dest: ./resources/[qbx]
src: ./tmp/qbx_spawn.zip

- action: download_file
path: ./tmp/qbx_customs.zip
url: https://github.com/qbox-project/qbx_customs/releases/latest/download/qbx_customs.zip
- action: unzip
dest: ./resources/[qbx]
src: ./tmp/qbx_customs.zip

# OX
- action: download_file
path: ./tmp/ox_lib.zip
Expand Down Expand Up @@ -304,4 +332,4 @@ tasks:

# Clean up
- action: remove_path
path: ./tmp
path: ./tmp
41 changes: 29 additions & 12 deletions qbox.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ tasks:
src: ./tmp/qbox/ox.cfg
dest: ./ox.cfg

- action: move_path
src: ./tmp/qbox/voice.cfg
dest: ./voice.cfg

- action: move_path
src: ./tmp/qbox/myLogo.png
dest: ./myLogo.png
Expand Down Expand Up @@ -178,10 +182,12 @@ tasks:
ref: main
src: https://github.com/qbox-project/qbx_scoreboard

- action: download_github
dest: ./resources/[qbx]/qbx_adminmenu
ref: main
src: https://github.com/qbox-project/qbx_adminmenu
- action: download_file
path: ./tmp/qbx_adminmenu.zip
url: https://github.com/qbox-project/qbx_adminmenu/releases/latest/download/qbx_adminmenu.zip
- action: unzip
dest: ./resources/[qbx]
src: ./tmp/qbx_adminmenu.zip

- action: waste_time # prevent github throttling
seconds: 10
Expand All @@ -205,10 +211,12 @@ tasks:
ref: main
src: https://github.com/qbox-project/qbx_houserobbery

- action: download_github
dest: ./resources/[qbx]/qbx_hud
ref: main
src: https://github.com/qbox-project/qbx_hud
- action: download_file
path: ./tmp/qbx_hud.zip
url: https://github.com/qbox-project/qbx_hud/releases/latest/download/qbx_hud.zip
- action: unzip
dest: ./resources/[qbx]
src: ./tmp/qbx_hud.zip

- action: download_github
dest: ./resources/[qbx]/qbx_seatbelt
Expand Down Expand Up @@ -308,10 +316,12 @@ tasks:
ref: main
src: https://github.com/qbox-project/qbx_storerobbery

- action: download_github
dest: ./resources/[qbx]/qbx_spawn
ref: main
src: https://github.com/qbox-project/qbx_spawn
- action: download_file
path: ./tmp/qbx_spawn.zip
url: https://github.com/qbox-project/qbx_spawn/releases/latest/download/qbx_spawn.zip
- action: unzip
dest: ./resources/[qbx]
src: ./tmp/qbx_spawn.zip

- action: download_file
path: ./tmp/qbx_smallresources.zip
Expand Down Expand Up @@ -433,6 +443,13 @@ tasks:
dest: ./resources/[qbx]
src: ./tmp/qbx_density.zip

- action: download_file
path: ./tmp/qbx_customs.zip
url: https://github.com/qbox-project/qbx_customs/releases/latest/download/qbx_customs.zip
- action: unzip
dest: ./resources/[qbx]
src: ./tmp/qbx_customs.zip

# OX
- action: download_file
path: ./tmp/ox_lib.zip
Expand Down
8 changes: 1 addition & 7 deletions server.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,7 @@ set resources_useSystemChat true
set mysql_connection_string "{{dbConnectionString}}"

# Voice config
setr voice_useNativeAudio true
setr voice_useSendingRangeOnly true
setr voice_enableUi 0
setr voice_defaultCycle "GRAVE"
setr voice_defaultRadioVolume 60
setr voice_defaultCallVolume 80
setr voice_enableRadioAnim 1
exec voice.cfg

# Qbox config
setr qb_locale "en"
Expand Down
128 changes: 128 additions & 0 deletions voice.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
# All of the configs here are set using setr [voice_configOption] [type]
# These convars are not FXServer specific. These are meant to be used for pma-voice. If you use a different voice system don't reference this file.

# =========================================================
# ==================== Audio Options ======================
# =========================================================

# The following 3 are audio options. Only use one at a time. Don't enable voice_use3dAudio & voice_useNativeAudio at the same time.

# Uses the games native audio, will add 3d sound, echo, reverb, and more. Required for submixes to work
# Default: false
# Type: boolean
setr voice_useNativeAudio true

# Uses 2d audio, will result in same volume sound no matter where they're at until they leave proximity.
# Default: false
# Type: boolean
# setr voice_use2dAudio false

# Enables the use of 3D audio for voice communication.
# Default: true
# Type: boolean
# setr voice_use3dAudio false

# Only allows you to hear people within your hear/send range, prevents people from connecting to your mumble server and trolling. Recommended to leave this on.
# Default: false
# Type: boolean
setr voice_useSendingRangeOnly true

# =========================================================
# =================== General Settings ====================
# =========================================================

# Enables the built in user interface
# Default: 1
# Type: integer
setr voice_enableUi 1

# Enables the usage of the F11 proximity key, if disabled players are stuck on the first proximity
# Default: 1
# Type: integer
setr voice_enableProximityCycle 1

# The default key to cycle the players proximity. You can find a list of valid keys in the Cfx docs: https://docs.fivem.net/docs/game-references/input-mapper-parameter-ids/keyboard/
# Default: "F11"
# Type: string
setr voice_defaultCycle "GRAVE"

# The default volume to set the radio to (has to be between 1 and 100)
# Default: 30
# Type: integer
setr voice_defaultRadioVolume 60

# The default volume to set the call to (has to be between 1 and 100)
# Default: 60
# Type: integer
setr voice_defaultCallVolume 80

# Default proximity voice value when player joins server. (Voice Modes; 1:Whisper, 2:Normal, 3:Shouting)
# Default: 2
# Type: integer
setr voice_defaultVoiceMode 2

# Enables the radio sub-modules
# Default: 1
# Type: integer
setr voice_enableRadios 1

# Enables the call sub-modules
# Default: 1
# Type: integer
setr voice_enableCalls 1

# Enables the submix which adds a radio/call style submix to their voice NOTE: Submixs require native audio
# Default: 1
# Type: integer
setr voice_enableSubmix 1

# Enables (grab shoulder mic) animation while talking on the radio.
# Default: 1
# Type: integer
setr voice_enableRadioAnim 1

# The default key to use the radio. You can find a list of valid keys in the FiveM docs: https://docs.fivem.net/docs/game-references/input-mapper-parameter-ids/keyboard/
# Default: "LMENU"
# Type: string
setr voice_defaultRadio "LMENU"

# How often the UI/Proximity is refreshed
# Default: 200
# Type: integer
setr voice_refreshRate 200

# Whether or not to allow players to set their audio intents (you can see more here: https://docs.fivem.net/natives/?_0x6383526B)
# Default: 1
# Type: integer
setr voice_allowSetIntent 1

# 1 for basic logs, 4 for verbose logs
# Default: 0
# Type: integer
setr voice_debugMode 0

# =========================================================
# ================= External Mumble Server ================
# =========================================================

# The external address to use to connect to the mumble server
# Default: ""
# Type: string
# setr voice_externalAddress "127.0.0.1"

# The external port to use
# Default: 0
# Type: integer
# setr voice_externalPort 64738

# THE FOLLOWING CONVARS SHOULD ONLY BE USED ON THE ACTUAL EXTERNAL MUMBLE SERVER

# Disables players being allowed to join the server, should only be used if you're using a FXServer as a external mumble server.
# Default: 0
# Type: integer
# setr voice_externalDisallowJoin 0

# Hides the mumble address in logs NOTE: You should only care to hide this for a external server.
# Default: 1
# Type: integer
# setr voice_hideEndpoints 1

0 comments on commit 6913693

Please sign in to comment.