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

Merge hotfix #1458

Merged
merged 5 commits into from
Nov 12, 2024
Merged

Merge hotfix #1458

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
af39f29
Merge pull request #1450 from esx-framework/1.11-hotfix
Arctos2win Nov 11, 2024
e53a628
chore: bump manifest version to 1.11.2
github-actions[bot] Nov 11, 2024
47a3054
Merge pull request #1451 from esx-framework/1.11-hotfix
Arctos2win Nov 11, 2024
7697e14
fix(esx_skin): always use latest Ped Id
Mycroft-Studios Nov 11, 2024
5d5f14a
Merge pull request #1453 from esx-framework/1.11-hotfix
Arctos2win Nov 11, 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 'Allows resources to Run tasks at specific intervals.'
lua54 'yes'
version '1.11.1'
version '1.11.2'

server_script 'server/main.lua'
1 change: 0 additions & 1 deletion [core]/es_extended/client/modules/actions.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ function Actions:TrackPed()
ESX.SetPlayerData("ped", playerPed)

TriggerEvent("esx:playerPedChanged", playerPed)
TriggerServerEvent("esx:playerPedChanged", PedToNet(playerPed))
end
end

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 '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',
Expand Down
4 changes: 1 addition & 3 deletions [core]/es_extended/shared/config/main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Config = {}

-- for ox inventory, use Config.CustomInventory = "ox", for others, set to "resource_name"
Config.CustomInventory = false

Config.Accounts = {
Expand Down Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion [core]/esx_chat_theme/fxmanifest.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version '1.11.1'
version '1.11.2'
author 'ESX-Framework'
description 'A ESX Stylised theme for the chat resource.'

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 'A simplistic context menu for ESX.'
lua54 'yes'
version '1.11.1'
version '1.11.2'

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 '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',
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
Expand Up @@ -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'
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 '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' }

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 'A basic input dialog for ESX Legacy.'
lua54 'yes'
version '1.11.1'
version '1.11.2'

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 'A basic table-based menu system for ESX Legacy.'
lua54 'yes'
version '1.11.1'
version '1.11.2'


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 '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' }
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.11.1'
version '1.11.2'
author 'ESX-Framework'
description 'A beautiful and simple 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'
description 'A beautiful and simple NUI progress bar for ESX'
version '1.11.1'
version '1.11.2'
lua54 'yes'

client_scripts { 'Progress.lua' }
Expand Down
4 changes: 2 additions & 2 deletions [core]/esx_skin/client/modules/camera.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion [core]/esx_skin/client/modules/menu.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
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 'Allows players to customise their character\'s appearance'
version '1.11.1'
version '1.11.2'
lua54 'yes'

shared_scripts {
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 @@ -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' }
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 @@ -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 {
Expand Down
Loading