Merge pull request #1458 from esx-framework/main

Merge hotfix
esx-framework · Nov 12, 2024 · 89c2f8a · 89c2f8a
2 parents b620a2f + 5d5f14a
commit 89c2f8a
Show file tree

Hide file tree

Showing 19 changed files with 19 additions and 22 deletions.
diff --git a/[core]/cron/fxmanifest.lua b/[core]/cron/fxmanifest.lua
@@ -4,6 +4,6 @@ game 'gta5'
 author 'ESX-Framework'
 description 'Allows resources to Run tasks at specific intervals.'
 lua54 'yes'
-version '1.11.1'
+version '1.11.2'
 
 server_script 'server/main.lua'
diff --git a/[core]/es_extended/client/modules/actions.lua b/[core]/es_extended/client/modules/actions.lua
@@ -48,7 +48,6 @@ function Actions:TrackPed()
         ESX.SetPlayerData("ped", playerPed)
 
         TriggerEvent("esx:playerPedChanged", playerPed)
-        TriggerServerEvent("esx:playerPedChanged", PedToNet(playerPed))
     end
 end
 

diff --git a/[core]/es_extended/fxmanifest.lua b/[core]/es_extended/fxmanifest.lua
@@ -3,7 +3,7 @@ fx_version 'cerulean'
 game 'gta5'
 description 'The Core resource that provides the functionalities for all other resources.'
 lua54 'yes'
-version '1.11.1'
+version '1.11.2'
 
 shared_scripts {
 	'locale.lua',

diff --git a/[core]/es_extended/shared/config/main.lua b/[core]/es_extended/shared/config/main.lua
@@ -1,5 +1,6 @@
 Config = {}
 
+-- for ox inventory, use Config.CustomInventory = "ox", for others, set to "resource_name"
 Config.CustomInventory = false
 
 Config.Accounts = {
@@ -53,9 +54,6 @@ Config.AdminLogging = false -- Logs the usage of certain commands by those with
 -- DO NOT CHANGE BELOW THIS LINE UNLESS YOU KNOW WHAT YOU ARE DOING
 --------------------------------------------------------------------
 Config.EnableDefaultInventory = Config.CustomInventory == false -- Display the default Inventory ( F2 )
-if GetResourceState("ox_inventory") ~= "missing" then
-    Config.CustomInventory = "ox"
-end
 
 local txAdminLocale = GetConvar("txAdmin-locale", "en")
 local esxLocale = GetConvar("esx:locale", "invalid")

diff --git a/[core]/esx_chat_theme/fxmanifest.lua b/[core]/esx_chat_theme/fxmanifest.lua
@@ -1,4 +1,4 @@
-version '1.11.1'
+version '1.11.2'
 author 'ESX-Framework'
 description 'A ESX Stylised theme for the chat resource.'
 

diff --git a/[core]/esx_context/fxmanifest.lua b/[core]/esx_context/fxmanifest.lua
@@ -4,7 +4,7 @@ game 'gta5'
 author 'ESX-Framework & Brayden'
 description 'A simplistic context menu for ESX.'
 lua54 'yes'
-version '1.11.1'
+version '1.11.2'
 
 ui_page 'index.html'
 

diff --git a/[core]/esx_identity/fxmanifest.lua b/[core]/esx_identity/fxmanifest.lua
@@ -3,7 +3,7 @@ fx_version 'adamant'
 game 'gta5'
 description 'Allows the player to Pick their characters: Name, Gender, Height and Date-of-birth.'
 lua54 'yes'
-version '1.11.1'
+version '1.11.2'
 
 shared_scripts {
 	'@es_extended/imports.lua',

diff --git a/[core]/esx_loadingscreen/fxmanifest.lua b/[core]/esx_loadingscreen/fxmanifest.lua
@@ -3,7 +3,7 @@ game 'common'
 fx_version 'cerulean'
 author 'ESX-Framework'
 description 'Allows resources to Run tasks at specific intervals.'
-version '1.11.1'
+version '1.11.2'
 lua54 'yes'
 
 loadscreen 'index.html'

diff --git a/[core]/esx_menu_default/fxmanifest.lua b/[core]/esx_menu_default/fxmanifest.lua
@@ -3,7 +3,7 @@ fx_version 'adamant'
 game 'gta5'
 description 'A basic menu system for ESX Legacy.'
 lua54 'yes'
-version '1.11.1'
+version '1.11.2'
 
 client_scripts { '@es_extended/imports.lua', 'client/main.lua' }
 

diff --git a/[core]/esx_menu_dialog/fxmanifest.lua b/[core]/esx_menu_dialog/fxmanifest.lua
@@ -3,7 +3,7 @@ fx_version 'adamant'
 game 'gta5'
 description 'A basic input dialog for ESX Legacy.'
 lua54 'yes'
-version '1.11.1'
+version '1.11.2'
 
 client_scripts {
 	'@es_extended/imports.lua',

diff --git a/[core]/esx_menu_list/fxmanifest.lua b/[core]/esx_menu_list/fxmanifest.lua
@@ -3,7 +3,7 @@ fx_version 'adamant'
 game 'gta5'
 description 'A basic table-based menu system for ESX Legacy.'
 lua54 'yes'
-version '1.11.1'
+version '1.11.2'
 
 
 client_scripts {

diff --git a/[core]/esx_multicharacter/fxmanifest.lua b/[core]/esx_multicharacter/fxmanifest.lua
@@ -3,7 +3,7 @@ fx_version 'cerulean'
 game 'gta5'
 author 'ESX-Framework - Linden - KASH'
 description 'Allows players to have multiple characters on the same account.'
-version '1.10.9'
+version '1.11.2'
 lua54 'yes'
 
 dependencies { 'es_extended', 'esx_context', 'esx_identity', 'esx_skin' }

diff --git a/[core]/esx_notify/fxmanifest.lua b/[core]/esx_notify/fxmanifest.lua
@@ -2,7 +2,7 @@ fx_version 'adamant'
 
 lua54 'yes'
 game 'gta5'
-version '1.11.1'
+version '1.11.2'
 author 'ESX-Framework'
 description 'A beautiful and simple NUI notification system for ESX'
 

diff --git a/[core]/esx_progressbar/fxmanifest.lua b/[core]/esx_progressbar/fxmanifest.lua
@@ -3,7 +3,7 @@ fx_version 'adamant'
 game 'gta5'
 author 'ESX-Framework'
 description 'A beautiful and simple NUI progress bar for ESX'
-version '1.11.1'
+version '1.11.2'
 lua54 'yes'
 
 client_scripts { 'Progress.lua' }

diff --git a/[core]/esx_skin/client/modules/camera.lua b/[core]/esx_skin/client/modules/camera.lua
@@ -36,7 +36,7 @@ function Camera:PositionLoop()
         while self.cam do
             self:DisableContols()
 
-            local ped = ESX.PlayerData.ped or PlayerPedId()
+            local ped = PlayerPedId()
             local coords = GetEntityCoords(ped)
 
             local pos, posToLook = Skin:CalcuatePosition(coords)
@@ -59,7 +59,7 @@ function Camera:Create()
         return
     end
 
-    local playerPed = ESX.PlayerData.ped or PlayerPedId()
+    local playerPed = PlayerPedId()
     local playerCoords = GetEntityCoords(playerPed)
 
     self.cam = CreateCam("DEFAULT_SCRIPTED_CAMERA", true)

diff --git a/[core]/esx_skin/client/modules/menu.lua b/[core]/esx_skin/client/modules/menu.lua
@@ -36,7 +36,7 @@ function Menu:Restrict()
 end
 
 function Menu:InsertElements()
-    local playerPed = ESX.PlayerData.ped or PlayerPedId()
+    local playerPed = PlayerPedId()
 
     for i = 1, #self.components, 1 do
         local value = self.components[i].value

diff --git a/[core]/esx_skin/fxmanifest.lua b/[core]/esx_skin/fxmanifest.lua
@@ -2,7 +2,7 @@ fx_version 'adamant'
 
 game 'gta5'
 description 'Allows players to customise their character\'s appearance'
-version '1.11.1'
+version '1.11.2'
 lua54 'yes'
 
 shared_scripts {

diff --git a/[core]/esx_textui/fxmanifest.lua b/[core]/esx_textui/fxmanifest.lua
@@ -3,7 +3,7 @@ fx_version 'adamant'
 game 'gta5'
 author 'ESX-Framework'
 description 'A beautiful and simple Persistent Notification system for ESX.'
-version '1.11.1'
+version '1.11.2'
 lua54 'yes'
 
 client_scripts { 'TextUI.lua' }

diff --git a/[core]/skinchanger/fxmanifest.lua b/[core]/skinchanger/fxmanifest.lua
@@ -2,7 +2,7 @@ fx_version 'adamant'
 
 game 'gta5'
 description 'Saves/loads character appearances for ESX Legacy.'
-version '1.11.1'
+version '1.11.2'
 lua54 'yes'
 
 client_scripts {