Merge pull request #1317 from esx-framework/1.10.5-fix-branch

🚑 1.10.5 merge to main
esx-framework · Feb 17, 2024 · b887903 · b887903
2 parents 7c59848 + 731b6a1
commit b887903
Show file tree

Hide file tree

Showing 15 changed files with 16 additions and 15 deletions.
diff --git a/[core]/cron/fxmanifest.lua b/[core]/cron/fxmanifest.lua
@@ -4,6 +4,6 @@ game 'gta5'
 author 'ESX-Framework'
 description 'cron'
 lua54 'yes'
-version '1.10.4'
+version '1.10.5'
 
 server_script 'server/main.lua'
diff --git a/[core]/es_extended/client/main.lua b/[core]/es_extended/client/main.lua
@@ -24,7 +24,7 @@ function ESX.SpawnPlayer(skin, coords, cb)
         p:resolve()
     end)
     Citizen.Await(p)
-
+    
     local playerPed = PlayerPedId()
     FreezeEntityPosition(playerPed, true)
     SetEntityCoordsNoOffset(playerPed, coords.x, coords.y, coords.z, false, false, false, true)
@@ -34,6 +34,7 @@ function ESX.SpawnPlayer(skin, coords, cb)
     end
     FreezeEntityPosition(playerPed, false)
     NetworkResurrectLocalPlayer(coords.x, coords.y, coords.z, coords.heading, true, true, false)
+    TriggerEvent('playerSpawned', coords)
     cb()
 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 'ES Extended'
 lua54 'yes'
-version '1.10.4'
+version '1.10.5'
 
 shared_scripts {
 	'locale.lua',

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 'Offical ESX Legacy Context Menu'
 lua54 'yes'
-version '1.10.4'
+version '1.10.5'
 
 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 'ESX Identity'
 lua54 'yes'
-version '1.10.4'
+version '1.10.5'
 
 shared_scripts {
 	'@es_extended/imports.lua',

diff --git a/[core]/esx_loadingscreen/fxmanifest.lua b/[core]/esx_loadingscreen/fxmanifest.lua
@@ -1,6 +1,6 @@
 game 'common'
 
-version '1.10.4'
+version '1.10.5'
 fx_version 'cerulean'
 author 'ESX-Framework'
 lua54 'yes'

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 'ESX Menu Default'
 lua54 'yes'
-version '1.10.4'
+version '1.10.5'
 
 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 'ESX Menu Dialog'
 lua54 'yes'
-version '1.10.4'
+version '1.10.5'
 
 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 'ESX Menu List'
 lua54 'yes'
-version '1.10.4'
+version '1.10.5'
 
 
 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 'Official Multicharacter System For ESX Legacy'
-version '1.10.4'
+version '1.10.5'
 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.10.4'
+version '1.10.5'
 author 'ESX-Framework'
 description 'Official 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'
 lua54 'yes'
-version '1.10.4'
+version '1.10.5'
 description 'ESX Progressbar'
 
 client_scripts { 'Progress.lua' }

diff --git a/[core]/esx_skin/fxmanifest.lua b/[core]/esx_skin/fxmanifest.lua
@@ -2,7 +2,7 @@ fx_version 'adamant'
 
 game 'gta5'
 description 'ESX Skin'
-version '1.10.4'
+version '1.10.5'
 lua54 'yes'
 
 shared_script '@es_extended/imports.lua'

diff --git a/[core]/esx_textui/fxmanifest.lua b/[core]/esx_textui/fxmanifest.lua
@@ -2,7 +2,7 @@ fx_version 'adamant'
 
 game 'gta5'
 author 'ESX-Framework'
-version '1.10.4'
+version '1.10.5'
 description 'ESX TextUI'
 lua54 'yes'
 

diff --git a/[core]/skinchanger/fxmanifest.lua b/[core]/skinchanger/fxmanifest.lua
@@ -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.4'
+version '1.10.5'
 
 client_scripts {
 	'@es_extended/locale.lua',