mirror of
https://github.com/esx-framework/esx_core.git
synced 2026-08-29 04:01:22 +00:00
Merge pull request #1317 from esx-framework/1.10.5-fix-branch
🚑 1.10.5 merge to main
This commit is contained in:
@@ -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'
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -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'
|
||||
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
game 'common'
|
||||
|
||||
version '1.10.4'
|
||||
version '1.10.5'
|
||||
fx_version 'cerulean'
|
||||
author 'ESX-Framework'
|
||||
lua54 'yes'
|
||||
|
||||
@@ -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' }
|
||||
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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' }
|
||||
|
||||
@@ -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'
|
||||
|
||||
|
||||
@@ -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' }
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -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'
|
||||
|
||||
|
||||
@@ -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',
|
||||
|
||||
Reference in New Issue
Block a user