mirror of
https://github.com/esx-framework/esx_core.git
synced 2026-08-29 01:08:54 +00:00
Merge branch 'dev' into fix-dev-to-main
This commit is contained in:
Gellipapa
@@ -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'
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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'
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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'
|
||||
|
||||
|
||||
@@ -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'
|
||||
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
<h1 align='center'>[ESX] Menu Defualt</a></h1><p align='center'><b><a href='https://discord.esx-framework.org/'>Discord</a> - <a href='https://esx-framework.org/'>Website</a> - <a href='https://documentation.esx-framework.org/legacy/installation'>Documentation</a></b></h5>
|
||||
|
||||
A defualt List type menu for ESX.
|
||||
A default List type menu for ESX.
|
||||
|
||||
|
||||
|
||||
|
||||
## Legal
|
||||
|
||||
esx_menu_defualt - Default Menu!
|
||||
esx_menu_default - Default Menu!
|
||||
|
||||
Copyright (C) 2015-2023 Jérémie N'gadi
|
||||
|
||||
|
||||
@@ -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'
|
||||
|
||||
|
||||
@@ -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.
|
||||
|
||||
|
||||
@@ -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'
|
||||
|
||||
|
||||
@@ -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.
|
||||
|
||||
|
||||
@@ -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'
|
||||
|
||||
|
||||
@@ -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'
|
||||
|
||||
|
||||
@@ -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 δεν υπάρχει",
|
||||
}
|
||||
@@ -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
|
||||
|
||||
@@ -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'
|
||||
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -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'
|
||||
|
||||
|
||||
@@ -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' }
|
||||
|
||||
@@ -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',
|
||||
|
||||
Reference in New Issue
Block a user