Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sync main to dev #1295

Merged
merged 5 commits into from
Jan 27, 2024
Merged

sync main to dev #1295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
922b633
Merge pull request #1292 from esx-framework/dev
Gellipapa Jan 24, 2024
8a91473
:memo: Update fxversion to 1.10.3
Gellipapa Jan 24, 2024
2dac6a5
Remove checking for start in ox inventory state
Arctos2win Jan 25, 2024
3f13bd5
Put ox inventory back in the configuration
Arctos2win Jan 25, 2024
d41ac35
Merge pull request #1293 from Arctos2win/main
TheFantomas Jan 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion [core]/cron/fxmanifest.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ game 'gta5'
author 'ESX-Framework'
description 'cron'
lua54 'yes'
version '1.10.2'
version '1.10.3'

server_script 'server/main.lua'
2 changes: 0 additions & 2 deletions [core]/es_extended/client/common.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ exports("getSharedObject", function()
return ESX
end)

Config.OxInventory = GetResourceState("ox_inventory"):find("start") and true

AddEventHandler("esx:getSharedObject", function()
local Invoke = GetInvokingResource()
print(("[^1ERROR^7] Resource ^5%s^7 Used the ^5getSharedObject^7 Event, this event ^1no longer exists!^7 Visit https://documentation.esx-framework.org/tutorials/tutorials-esx/sharedevent for how to fix!"):format(Invoke))
Expand Down
2 changes: 2 additions & 0 deletions [core]/es_extended/config.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
Config = {}
Config.Locale = GetConvar("esx:locale", "en")

Config.OxInventory = GetResourceState("ox_inventory") ~= 'missing'

Config.Accounts = {
bank = {
label = TranslateCap("account_bank"),
Expand Down
2 changes: 1 addition & 1 deletion [core]/es_extended/fxmanifest.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ fx_version 'cerulean'
game 'gta5'
description 'ES Extended'
lua54 'yes'
version '1.10.2'
version '1.10.3'

shared_scripts {
'locale.lua',
Expand Down
3 changes: 1 addition & 2 deletions [core]/es_extended/server/common.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ exports("getSharedObject", function()
return ESX
end)

if GetResourceState("ox_inventory"):find("start") then
Config.OxInventory = true
if Config.OxInventory then
Config.PlayerFunctionOverride = "OxInventory"
SetConvarReplicated("inventory:framework", "esx")
SetConvarReplicated("inventory:weight", Config.MaxWeight * 1000)
Expand Down
2 changes: 1 addition & 1 deletion [core]/esx_context/fxmanifest.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ game 'gta5'
author 'ESX-Framework & Brayden'
description 'Offical ESX Legacy Context Menu'
lua54 'yes'
version '1.10.2'
version '1.10.3'

ui_page 'index.html'

Expand Down
2 changes: 1 addition & 1 deletion [core]/esx_identity/fxmanifest.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ fx_version 'adamant'
game 'gta5'
description 'ESX Identity'
lua54 'yes'
version '1.10.2'
version '1.10.3'

shared_scripts {
'@es_extended/imports.lua',
Expand Down
2 changes: 1 addition & 1 deletion [core]/esx_loadingscreen/fxmanifest.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
game 'common'

version '1.10.2'
version '1.10.3'
fx_version 'cerulean'
author 'ESX-Framework'
lua54 'yes'
Expand Down
2 changes: 1 addition & 1 deletion [core]/esx_menu_default/fxmanifest.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ fx_version 'adamant'
game 'gta5'
description 'ESX Menu Default'
lua54 'yes'
version '1.10.2'
version '1.10.3'

client_scripts { '@es_extended/imports.lua', 'client/main.lua' }

Expand Down
2 changes: 1 addition & 1 deletion [core]/esx_menu_dialog/fxmanifest.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ fx_version 'adamant'
game 'gta5'
description 'ESX Menu Dialog'
lua54 'yes'
version '1.10.2'
version '1.10.3'

client_scripts {
'@es_extended/imports.lua',
Expand Down
2 changes: 1 addition & 1 deletion [core]/esx_menu_list/fxmanifest.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ fx_version 'adamant'
game 'gta5'
description 'ESX Menu List'
lua54 'yes'
version '1.10.2'
version '1.10.3'


client_scripts {
Expand Down
2 changes: 1 addition & 1 deletion [core]/esx_multicharacter/fxmanifest.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ fx_version 'cerulean'
game 'gta5'
author 'ESX-Framework - Linden - KASH'
description 'Official Multicharacter System For ESX Legacy'
version '1.10.2'
version '1.10.3'
lua54 'yes'

dependencies { 'es_extended', 'esx_context', 'esx_identity', 'esx_skin' }
Expand Down
2 changes: 1 addition & 1 deletion [core]/esx_notify/fxmanifest.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ fx_version 'adamant'

lua54 'yes'
game 'gta5'
version '1.10.2'
version '1.10.3'
author 'ESX-Framework'
description 'Official NUI Notification system for ESX'

Expand Down
2 changes: 1 addition & 1 deletion [core]/esx_progressbar/fxmanifest.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ fx_version 'adamant'
game 'gta5'
author 'ESX-Framework'
lua54 'yes'
version '1.10.2'
version '1.10.3'
description 'ESX Progressbar'

client_scripts { 'Progress.lua' }
Expand Down
2 changes: 1 addition & 1 deletion [core]/esx_skin/fxmanifest.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ fx_version 'adamant'

game 'gta5'
description 'ESX Skin'
version '1.10.2'
version '1.10.3'
lua54 'yes'

shared_script '@es_extended/imports.lua'
Expand Down
2 changes: 1 addition & 1 deletion [core]/esx_textui/fxmanifest.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ fx_version 'adamant'

game 'gta5'
author 'ESX-Framework'
version '1.10.2'
version '1.10.3'
description 'ESX TextUI'
lua54 'yes'

Expand Down
2 changes: 1 addition & 1 deletion [core]/skinchanger/fxmanifest.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ fx_version 'adamant'
game 'gta5'
lua54 'yes'
description 'Official ESX-Legacy resource for handling the Player`s Skin'
version '1.10.2'
version '1.10.3'

client_scripts {
'@es_extended/locale.lua',
Expand Down
Loading