diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index 3357e883a..62f30fb67 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -30,7 +30,7 @@ [voice-ui/pnpm-lock.yaml]: chore(deps-dev): bump follow-redirects in /voice-ui [voice-ui/pnpm-lock.yaml]: chore(deps-dev): bump browserify-sign from 4.2.1 to 4.2.2 in /voice-ui 7. [npwd + es_extended]: chore: removed support for npwd_crypto @bitpredator -8. [ox_lib]: chore: ox_lib update to version '3.11.0' @bitpredator +8. [ox_lib]: chore: ox_lib update to version 3.12.0 @bitpredator 9. [esx_addons]: chore: replace esx_drivingschooljob with esx_dmvschool @bitpredator 10. [SQL]: chore: update database @bitpredator 11. [maps]: delete: remove maps verpi_driving_school @bitpredator diff --git a/server-data/resources/[ox]/ox_lib/fxmanifest.lua b/server-data/resources/[ox]/ox_lib/fxmanifest.lua index 5bc38f2b1..fd4feca5b 100644 --- a/server-data/resources/[ox]/ox_lib/fxmanifest.lua +++ b/server-data/resources/[ox]/ox_lib/fxmanifest.lua @@ -8,7 +8,7 @@ rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aw --[[ Resource Information ]]-- name 'ox_lib' author 'Overextended' -version '3.11.0' +version '3.12.0' license 'LGPL-3.0-or-later' repository 'https://github.com/overextended/ox_lib' description 'A library of shared functions to utilise in other resources.' diff --git a/server-data/resources/[ox]/ox_lib/imports/require/shared.lua b/server-data/resources/[ox]/ox_lib/imports/require/shared.lua index 0454e1bae..7b3f89a40 100644 --- a/server-data/resources/[ox]/ox_lib/imports/require/shared.lua +++ b/server-data/resources/[ox]/ox_lib/imports/require/shared.lua @@ -38,7 +38,7 @@ function lib.require(modname) local di = debug.getinfo(idx, 'S') if di then - if not di.short_src:find('^@ox_lib/imports/require') and not di.short_src:find('^%[C%]') and not di.short_src:find('^citizen') then + if not di.short_src:find('^@ox_lib/imports/require') and not di.short_src:find('^%[C%]') and not di.short_src:find('^citizen') and di.short_src ~= '?' then resourceSrc = di.short_src:gsub('^@(.-)/.+', '%1') break end diff --git a/server-data/resources/[ox]/ox_lib/resource/interface/client/menu.lua b/server-data/resources/[ox]/ox_lib/resource/interface/client/menu.lua index 60b95dd66..5845bb725 100644 --- a/server-data/resources/[ox]/ox_lib/resource/interface/client/menu.lua +++ b/server-data/resources/[ox]/ox_lib/resource/interface/client/menu.lua @@ -46,28 +46,27 @@ end ---@param startIndex? number function lib.showMenu(id, startIndex) local menu = registeredMenus[id] - if not menu then error(('No menu with id %s was found'):format(id)) end - if not openMenu then local control = cache.game == 'fivem' and 140 or 0xE30CD707 + CreateThread(function() while openMenu do if openMenu.disableInput == nil or openMenu.disableInput then DisablePlayerFiring(cache.playerId, true) - HudWeaponWheelIgnoreSelection() + if cache.game == 'fivem' then + HudWeaponWheelIgnoreSelection() -- Not a REDM native + end DisableControlAction(0, control, true) end - Wait(0) end end) end openMenu = menu - lib.setNuiFocus(not menu.disableInput, true) SendNUIMessage({ @@ -81,7 +80,6 @@ function lib.showMenu(id, startIndex) } }) end - ---@param onExit boolean? function lib.hideMenu(onExit) local menu = openMenu diff --git a/server-data/resources/[ox]/ox_lib/resource/interface/client/radial.lua b/server-data/resources/[ox]/ox_lib/resource/interface/client/radial.lua index 77ee3d637..a7ed00de5 100644 --- a/server-data/resources/[ox]/ox_lib/resource/interface/client/radial.lua +++ b/server-data/resources/[ox]/ox_lib/resource/interface/client/radial.lua @@ -324,6 +324,7 @@ lib.addKeybind({ DisablePlayerFiring(cache.playerId, true) DisableControlAction(0, 1, true) DisableControlAction(0, 2, true) + DisableControlAction(0, 142, true) DisableControlAction(2, 199, true) DisableControlAction(2, 200, true) Wait(0)