starred/esx_core
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-08-29 01:08:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'esx-framework:main' into main

Browse Source
This commit is contained in:
JonarSonaer
2022-04-02 09:29:20 +02:00
committed by GitHub
parent 81ea0bf3cc d287542fd5
commit e306545ffa
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
[esx_addons]/esx_jobs/fxmanifest.lua
+1 -3
View File
@@ -2,7 +2,7 @@ fx_version 'adamant'
game 'gta5'
description 'ESX Job Listing'
description 'ESX Jobs'
version '1.6.5'
@@ -19,8 +19,6 @@ server_scripts {
}
client_scripts {
'@es_extended/locale.lua',
'locales/*.lua',
'client/main.lua'
}
[esx_addons]/esx_property/client/main.lua
+2 -1
View File
@@ -890,6 +890,7 @@ CreateThread(function()
CurrentAction = nil
end
Wait(Sleep)
end
Wait(Sleep)
end
end)
[esx_addons]/esx_sit/config.lua
+2 -2
View File
@@ -12,7 +12,7 @@ Config.Interactables = {
'prop_bench_04',
'prop_bench_05',
'prop_bench_06',
'prop_bench_05',
'prop_bench_07',
'prop_bench_08',
'prop_bench_09',
'prop_bench_10',
@@ -30,7 +30,7 @@ Config.Interactables = {
'prop_chair_04b',
'prop_chair_05',
'prop_chair_06',
'prop_chair_05',
'prop_chair_07',
'prop_chair_08',
'prop_chair_09',
'prop_chair_10',
[esx_addons]/esx_sit/lists/seat.lua
+1 -1
View File
@@ -32,7 +32,7 @@ Config.Sitable = {
prop_chair_04b = { scenario = 'PROP_HUMAN_SEAT_BENCH', verticalOffset = -0.5, forwardOffset = 0.0, leftOffset = 0.0},
prop_chair_05 = { scenario = 'PROP_HUMAN_SEAT_BENCH', verticalOffset = -0.5, forwardOffset = 0.0, leftOffset = 0.0},
prop_chair_06 = { scenario = 'PROP_HUMAN_SEAT_BENCH', verticalOffset = -0.5, forwardOffset = 0.0, leftOffset = 0.0},
prop_chair_057 = { scenario = 'PROP_HUMAN_SEAT_BENCH', verticalOffset = -0.5, forwardOffset = 0.0, leftOffset = 0.0},
prop_chair_07 = { scenario = 'PROP_HUMAN_SEAT_BENCH', verticalOffset = -0.5, forwardOffset = 0.0, leftOffset = 0.0},
prop_chair_08 = { scenario = 'PROP_HUMAN_SEAT_BENCH', verticalOffset = -0.5, forwardOffset = 0.0, leftOffset = 0.0},
prop_chair_09 = { scenario = 'PROP_HUMAN_SEAT_BENCH', verticalOffset = -0.5, forwardOffset = 0.0, leftOffset = 0.0},
prop_chair_10 = { scenario = 'PROP_HUMAN_SEAT_BENCH', verticalOffset = -0.5, forwardOffset = 0.0, leftOffset = 0.0},