diff --git a/[core]/cron/fxmanifest.lua b/[core]/cron/fxmanifest.lua index 1d9878f8..ca0036fd 100644 --- a/[core]/cron/fxmanifest.lua +++ b/[core]/cron/fxmanifest.lua @@ -2,7 +2,7 @@ fx_version 'adamant' game 'gta5' author 'ESX-Framework' -description 'cron' +description 'Allows resources to Run tasks at specific intervals.' lua54 'yes' version '1.10.5' diff --git a/[core]/es_extended/client/main.lua b/[core]/es_extended/client/main.lua index 476e4f99..daccaa1d 100644 --- a/[core]/es_extended/client/main.lua +++ b/[core]/es_extended/client/main.lua @@ -271,32 +271,16 @@ AddEventHandler("esx:restoreLoadout", function() end end) --- Credit: https://github.com/LukeWasTakenn, https://github.com/LukeWasTakenn/luke_garages/blob/master/client/client.lua#L331-L352 AddStateBagChangeHandler("VehicleProperties", nil, function(bagName, _, value) if not value then return end local netId = bagName:gsub("entity:", "") - local timer = GetGameTimer() - while not NetworkDoesEntityExistWithNetworkId(tonumber(netId)) do - Wait(0) - if GetGameTimer() - timer > 10000 then - return - end - end - local vehicle = NetToVeh(tonumber(netId)) - local timer2 = GetGameTimer() - while NetworkGetEntityOwner(vehicle) ~= PlayerId() do - Wait(0) - if GetGameTimer() - timer2 > 10000 then - return - end - end - + ESX.Game.SetVehicleProperties(vehicle, value) -end) +end) RegisterNetEvent("esx:setAccountMoney") AddEventHandler("esx:setAccountMoney", function(account) diff --git a/[core]/es_extended/config.lua b/[core]/es_extended/config.lua index 6f899f1d..3d82a1f0 100644 --- a/[core]/es_extended/config.lua +++ b/[core]/es_extended/config.lua @@ -38,21 +38,21 @@ Config.AdminGroups = { Config.EnablePaycheck = true -- enable paycheck Config.LogPaycheck = false -- Logs paychecks to a nominated Discord channel via webhook (default is false) Config.EnableSocietyPayouts = false -- pay from the society account that the player is employed at? Requirement: esx_society -Config.MaxWeight = 24 -- the max inventory weight without backpack -Config.PaycheckInterval = 7 * 60000 -- how often to recieve pay checks in milliseconds +Config.MaxWeight = 24 -- the max inventory weight without a backpack +Config.PaycheckInterval = 7 * 60000 -- how often to receive paychecks in milliseconds Config.EnableDebug = false -- Use Debug options? Config.EnableDefaultInventory = true -- Display the default Inventory ( F2 ) Config.EnableWantedLevel = false -- Use Normal GTA wanted Level? Config.EnablePVP = true -- Allow Player to player combat Config.Multichar = GetResourceState("esx_multicharacter") ~= "missing" -Config.Identity = true -- Select a characters identity data before they have loaded in (this happens by default with multichar) +Config.Identity = true -- Select a character identity data before they have loaded in (this happens by default with multichar) Config.DistanceGive = 4.0 -- Max distance when giving items, weapons etc. Config.AdminLogging = false -- Logs the usage of certain commands by those with group.admin ace permissions (default is false) Config.DisableHealthRegeneration = false -- Player will no longer regenerate health -Config.DisableVehicleRewards = false -- Disables Player Recieving weapons from vehicles +Config.DisableVehicleRewards = false -- Disables Player Receiving weapons from vehicles Config.DisableNPCDrops = false -- stops NPCs from dropping weapons on death Config.DisableDispatchServices = false -- Disable Dispatch services Config.DisableScenarios = false -- Disable Scenarios @@ -85,12 +85,12 @@ Config.RemoveHudComponents = { [22] = false, --HUD_WEAPONS } -Config.SpawnVehMaxUpgrades = true -- admin vehicles spawn with max vehcle settings +Config.SpawnVehMaxUpgrades = true -- admin vehicles spawn with max vehicle settings Config.CustomAIPlates = "........" -- Custom plates for AI vehicles -- Pattern string format --1 will lead to a random number from 0-9. --A will lead to a random letter from A-Z. --- . will lead to a random letter or number, with 50% probability of being either. +-- . will lead to a random letter or number, with a 50% probability of being either. --^1 will lead to a literal 1 being emitted. --^A will lead to a literal A being emitted. --Any other character will lead to said character being emitted. diff --git a/[core]/es_extended/fxmanifest.lua b/[core]/es_extended/fxmanifest.lua index fe10450d..cac174a7 100644 --- a/[core]/es_extended/fxmanifest.lua +++ b/[core]/es_extended/fxmanifest.lua @@ -1,7 +1,7 @@ fx_version 'cerulean' game 'gta5' -description 'ES Extended' +description 'The Core resource that provides the functionalities for all other resources.' lua54 'yes' version '1.10.5' diff --git a/[core]/es_extended/server/functions.lua b/[core]/es_extended/server/functions.lua index 38834ddc..1a777c7a 100644 --- a/[core]/es_extended/server/functions.lua +++ b/[core]/es_extended/server/functions.lua @@ -549,15 +549,7 @@ if not Config.OxInventory then end function ESX.DoesJobExist(job, grade) - grade = tostring(grade) - - if job and grade then - if ESX.Jobs[job] and ESX.Jobs[job].grades[grade] then - return true - end - end - - return false + return (ESX.Jobs[job] and ESX.Jobs[job].grades[tostring(grade)] ~= nil) or false end function Core.IsPlayerAdmin(playerId) diff --git a/[core]/esx_context/fxmanifest.lua b/[core]/esx_context/fxmanifest.lua index a0334dba..28ebebe6 100644 --- a/[core]/esx_context/fxmanifest.lua +++ b/[core]/esx_context/fxmanifest.lua @@ -2,7 +2,7 @@ fx_version 'bodacious' game 'gta5' author 'ESX-Framework & Brayden' -description 'Offical ESX Legacy Context Menu' +description 'A simplistic context menu for ESX.' lua54 'yes' version '1.10.5' diff --git a/[core]/esx_identity/fxmanifest.lua b/[core]/esx_identity/fxmanifest.lua index bdfd042f..b6120014 100644 --- a/[core]/esx_identity/fxmanifest.lua +++ b/[core]/esx_identity/fxmanifest.lua @@ -1,7 +1,7 @@ fx_version 'adamant' game 'gta5' -description 'ESX Identity' +description 'Allows the player to Pick their characters: Name, Gender, Height and Date-of-birth.' lua54 'yes' version '1.10.5' diff --git a/[core]/esx_loadingscreen/fxmanifest.lua b/[core]/esx_loadingscreen/fxmanifest.lua index c0f5a921..1f29ac91 100644 --- a/[core]/esx_loadingscreen/fxmanifest.lua +++ b/[core]/esx_loadingscreen/fxmanifest.lua @@ -1,9 +1,11 @@ game 'common' -version '1.10.5' fx_version 'cerulean' author 'ESX-Framework' +description 'Allows resources to Run tasks at specific intervals.' +version '1.10.5' lua54 'yes' + loadscreen 'index.html' shared_script 'config.lua' diff --git a/[core]/esx_menu_default/README.md b/[core]/esx_menu_default/README.md index b06d5124..a9c1bb45 100644 --- a/[core]/esx_menu_default/README.md +++ b/[core]/esx_menu_default/README.md @@ -1,13 +1,13 @@

[ESX] Menu Defualt

Discord - Website - Documentation -A defualt List type menu for ESX. +A default List type menu for ESX. ![Preview_1](https://cdn.discordapp.com/attachments/944789399852417096/997882867336101948/Screenshot_52.png) ![Preview_2](https://cdn.discordapp.com/attachments/944789399852417096/997882867688411176/Screenshot_53.png) ## Legal -esx_menu_defualt - Default Menu! +esx_menu_default - Default Menu! Copyright (C) 2015-2023 Jérémie N'gadi diff --git a/[core]/esx_menu_default/fxmanifest.lua b/[core]/esx_menu_default/fxmanifest.lua index 3782aff6..1d26b2ae 100644 --- a/[core]/esx_menu_default/fxmanifest.lua +++ b/[core]/esx_menu_default/fxmanifest.lua @@ -1,7 +1,7 @@ fx_version 'adamant' game 'gta5' -description 'ESX Menu Default' +description 'A basic menu system for ESX Legacy.' lua54 'yes' version '1.10.5' diff --git a/[core]/esx_menu_dialog/README.md b/[core]/esx_menu_dialog/README.md index e1d9c85a..3a50de88 100644 --- a/[core]/esx_menu_dialog/README.md +++ b/[core]/esx_menu_dialog/README.md @@ -1,23 +1,6 @@ # esx_menu_dialog Simple script used for inputs. -## Download & Installation - -### Using [fvm](https://github.com/qlaffont/fvm-installer) -``` -fvm install --save --folder=esx esx-org/esx_menu_dialog -``` - -### Using Git -``` -cd resources -git clone https://github.com/ESX-Org/esx_menu_dialog [esx]/esx_menu_dialog -``` - -### Manually -- Download https://github.com/ESX-Org/esx_menu_dialog/archive/master.zip -- Put it in the `[esx]` directory - ## Installation - Add this to your `server.cfg`: @@ -29,7 +12,7 @@ start esx_menu_dialog ### License esx_menu_dialog - input dialog for ESX -Copyright (C) 2015-2023 Jérémie N'gadi +Copyright (C) 2015-2024 ESX-Framework This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[core]/esx_menu_dialog/fxmanifest.lua b/[core]/esx_menu_dialog/fxmanifest.lua index 1513b3b1..33cdc713 100644 --- a/[core]/esx_menu_dialog/fxmanifest.lua +++ b/[core]/esx_menu_dialog/fxmanifest.lua @@ -1,7 +1,7 @@ fx_version 'adamant' game 'gta5' -description 'ESX Menu Dialog' +description 'A basic input dialog for ESX Legacy.' lua54 'yes' version '1.10.5' diff --git a/[core]/esx_menu_list/README.md b/[core]/esx_menu_list/README.md index 173045d2..cdfc2fcb 100644 --- a/[core]/esx_menu_list/README.md +++ b/[core]/esx_menu_list/README.md @@ -1,35 +1,11 @@ # esx_menu_list Advanced menu inputs for ESX -## Download & Installation - -### Using [fvm](https://github.com/qlaffont/fvm-installer) -``` -fvm install --save --folder=esx esx-org/esx_menu_list -``` - -### Using Git -``` -cd resources -git clone https://github.com/ESX-Org/esx_menu_list [esx]/esx_menu_list -``` - -### Manually -- Download https://github.com/ESX-Org/esx_menu_list/archive/master.zip -- Put it in the `[esx]` directory - -## Installation -- Add this to your `server.cfg`: - -``` -start esx_menu_list -``` - # Legal ### License esx_menu_list - advanced menu inputs for ESX -Copyright (C) 2015-2023 Jérémie N'gadi +Copyright (C) 2015-2024 ESX-Framework This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[core]/esx_menu_list/fxmanifest.lua b/[core]/esx_menu_list/fxmanifest.lua index cab86347..fbc887e6 100644 --- a/[core]/esx_menu_list/fxmanifest.lua +++ b/[core]/esx_menu_list/fxmanifest.lua @@ -1,7 +1,7 @@ fx_version 'adamant' game 'gta5' -description 'ESX Menu List' +description 'A basic table-based menu system for ESX Legacy.' lua54 'yes' version '1.10.5' diff --git a/[core]/esx_multicharacter/fxmanifest.lua b/[core]/esx_multicharacter/fxmanifest.lua index b433c871..398ad3de 100644 --- a/[core]/esx_multicharacter/fxmanifest.lua +++ b/[core]/esx_multicharacter/fxmanifest.lua @@ -2,7 +2,7 @@ fx_version 'cerulean' game 'gta5' author 'ESX-Framework - Linden - KASH' -description 'Official Multicharacter System For ESX Legacy' +description 'Allows players to have multiple characters on the same account.' version '1.10.5' lua54 'yes' diff --git a/[core]/esx_multicharacter/locales/gr.lua b/[core]/esx_multicharacter/locales/gr.lua new file mode 100644 index 00000000..49b832ca --- /dev/null +++ b/[core]/esx_multicharacter/locales/gr.lua @@ -0,0 +1,32 @@ +Locales["gr"] = { + ["male"] = "Άνδρας", + ["female"] = "Γυναίκα", + ["select_char"] = "Επιλογή Χαρακτήρα", + ["select_char_description"] = "Επιλέξτε ένα χαρακτήρα για να παίξετε.", + ["create_char"] = "Νέος Χαρακτήρας", + ["char_play"] = "Παίξτε", + ["char_play_description"] = "Συνέχεια στην πόλη.", + ["char_disabled"] = "Απενεργοποιημένος", + ["char_disabled_description"] = "Αυτός ο χαρακτήρας δεν είναι χρησιμοποιήσιμος.", + ["char_delete"] = "Διαγραφή", + ["char_delete_description"] = "Διαγράψτε οριστικά αυτόν τον χαρακτήρα.", + ["char_delete_confirmation"] = "Επιβεβαίωση Διαγραφής", + ["char_delete_confirmation_description"] = "Είστε σίγουρος ότι θέλετε να διαγράψετε τον επιλεγμένο χαρακτήρα;", + ["char_delete_yes_description"] = "Ναι, είμαι σίγουρος ότι θέλω να διαγράψω τον επιλεγμένο χαρακτήρα", + ["char_delete_no_description"] = "Όχι, επιστροφή στις επιλογές χαρακτήρα", + ["character"] = "Χαρακτήρας: %s", + ["return"] = "Επιστροφή", + ["return_description"] = "Επιστροφή στην επιλογή χαρακτήρα.", + ["command_setslots"] = "Ορίστε τον αριθμό των slot πολλαπλών χαρακτήρων ενός παίκτη", + ["command_remslots"] = "Αφαιρέστε τον αριθμό των slot πολλαπλών χαρακτήρων ενός παίκτη", + ["command_enablechar"] = "Ενεργοποιήστε έναν συγκεκριμένο χαρακτήρα ενός παίκτη", + ["command_disablechar"] = "Απενεργοποιήστε έναν συγκεκριμένο χαρακτήρα ενός παίκτη", + ["command_charslot"] = "Αριθμός υποδιαίρεσης του χαρακτήρα", + ["command_identifier"] = "Ταυτότητα παίκτη", + ["command_slots"] = "Αριθμός slot", + ["slotsadd"] = "Ορίσατε %s slot σε %s", + ["slotsrem"] = "Αφαιρέσατε slot από τον %s", + ["charenabled"] = "Ενεργοποιήσατε τον χαρακτήρα #%s του %s", + ["chardisabled"] = "Απενεργοποιήσατε τον χαρακτήρα #%s του %s", + ["charnotfound"] = "Ο χαρακτήρας #%s του %s δεν υπάρχει", +} diff --git a/[core]/esx_notify/Notify.lua b/[core]/esx_notify/Notify.lua index 44f19fb6..d47066f8 100644 --- a/[core]/esx_notify/Notify.lua +++ b/[core]/esx_notify/Notify.lua @@ -25,8 +25,8 @@ local function Notify(notificatonType, length, message) end SendNuiMessage(json.encode({ - type = notificatonType or "info", - length = length or 3000, + type = notificatonType, + length = length, message = message or "ESX-Notify", })) end diff --git a/[core]/esx_notify/fxmanifest.lua b/[core]/esx_notify/fxmanifest.lua index bdb6f40c..d18d867e 100644 --- a/[core]/esx_notify/fxmanifest.lua +++ b/[core]/esx_notify/fxmanifest.lua @@ -4,7 +4,7 @@ lua54 'yes' game 'gta5' version '1.10.5' author 'ESX-Framework' -description 'Official NUI Notification system for ESX' +description 'A beautiful and simple NUI notification system for ESX' shared_script '@es_extended/imports.lua' diff --git a/[core]/esx_progressbar/fxmanifest.lua b/[core]/esx_progressbar/fxmanifest.lua index 502a543d..c034adcf 100644 --- a/[core]/esx_progressbar/fxmanifest.lua +++ b/[core]/esx_progressbar/fxmanifest.lua @@ -2,9 +2,9 @@ fx_version 'adamant' game 'gta5' author 'ESX-Framework' -lua54 'yes' +description 'A beautiful and simple NUI progress bar for ESX' version '1.10.5' -description 'ESX Progressbar' +lua54 'yes' client_scripts { 'Progress.lua' } shared_script '@es_extended/imports.lua' diff --git a/[core]/esx_skin/fxmanifest.lua b/[core]/esx_skin/fxmanifest.lua index 436be397..44683a05 100644 --- a/[core]/esx_skin/fxmanifest.lua +++ b/[core]/esx_skin/fxmanifest.lua @@ -1,7 +1,7 @@ fx_version 'adamant' game 'gta5' -description 'ESX Skin' +description 'Allows players to customise their character\'s appearance' version '1.10.5' lua54 'yes' diff --git a/[core]/esx_textui/fxmanifest.lua b/[core]/esx_textui/fxmanifest.lua index 389761db..e77a61a4 100644 --- a/[core]/esx_textui/fxmanifest.lua +++ b/[core]/esx_textui/fxmanifest.lua @@ -2,8 +2,8 @@ fx_version 'adamant' game 'gta5' author 'ESX-Framework' +description 'A beautiful and simple Persistent Notification system for ESX.' version '1.10.5' -description 'ESX TextUI' lua54 'yes' client_scripts { 'TextUI.lua' } diff --git a/[core]/skinchanger/fxmanifest.lua b/[core]/skinchanger/fxmanifest.lua index 641deaf5..c8ada324 100644 --- a/[core]/skinchanger/fxmanifest.lua +++ b/[core]/skinchanger/fxmanifest.lua @@ -1,9 +1,9 @@ fx_version 'adamant' game 'gta5' -lua54 'yes' -description 'Official ESX-Legacy resource for handling the Player`s Skin' +description 'Saves/loads character appearances for ESX Legacy.' version '1.10.5' +lua54 'yes' client_scripts { '@es_extended/locale.lua',