diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000..8dd3e89f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+ - name: General Support
+ url: http://discord.esx-framework.org/
+ about: Please ask general questions on our Discord!
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 00000000..235933f2
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,17 @@
+---
+name: Feature Request
+about: Help us improve esx with your ideas
+title: "[Feature Request] - esx_script - Add better configuration"
+labels: enhancement
+assignees: Benzo00
+
+---
+
+**Describe the Feature**
+A simple description of the new feature.
+
+**Screenshots**
+You can also add some screenshots.
+
+**Additional context**
+If you want to add something more.
diff --git a/LICENSE b/LICENSE
index 506b94b4..c99ad3e4 100644
--- a/LICENSE
+++ b/LICENSE
@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
esx-legacy
- Copyright (C) 2015-2022 Jérémie N'gadi
+ Copyright (C) 2015-2023 Jérémie N'gadi
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
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
- esx-legacy Copyright (C) 2015-2022 Jérémie N'gadi
+ esx-legacy Copyright (C) 2015-2023 Jérémie N'gadi
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
diff --git a/[SQL]/legacy.sql b/[SQL]/legacy.sql
index 6db07072..15e49771 100644
--- a/[SQL]/legacy.sql
+++ b/[SQL]/legacy.sql
@@ -329,7 +329,8 @@ INSERT INTO `licenses` (`type`, `label`) VALUES
('drive', 'Drivers License'),
('drive_bike', 'Motorcycle License'),
('drive_truck', 'Commercial Drivers License'),
-('weed_processing', 'Weed Processing License');
+('weed_processing', 'Weed Processing License'),
+('boat', 'Boat License');
-- --------------------------------------------------------
@@ -709,12 +710,13 @@ INSERT INTO `vehicle_categories` (`name`, `label`) VALUES
--
CREATE TABLE `vehicle_sold` (
- `id` INT(11) NOT NULL,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
`client` varchar(50) NOT NULL,
`model` varchar(50) NOT NULL,
`plate` varchar(50) NOT NULL,
`soldby` varchar(50) NOT NULL,
- `date` varchar(50) NOT NULL
+ `date` varchar(50) NOT NULL,
+ PRIMARY KEY (`id`)
) ENGINE=InnoDB;
--
@@ -846,24 +848,12 @@ ALTER TABLE `user_licenses`
ALTER TABLE `vehicle_categories`
ADD PRIMARY KEY (`name`);
---
--- Indexes for table `vehicle_sold`
---
-ALTER TABLE `vehicle_sold`
- ADD PRIMARY KEY (`id`);
-
--
-- Indexes for table `whitelist`
--
ALTER TABLE `whitelist`
ADD PRIMARY KEY (`identifier`);
---
--- Indexes for table `vehicle_sold`
---
-ALTER TABLE `vehicle_sold`
- MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
-
--
-- AUTO_INCREMENT for table `addon_account_data`
--
@@ -1038,5 +1028,4 @@ CREATE TABLE IF NOT EXISTS `banking` (
PRIMARY KEY (`ID`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;
-ALTER TABLE `users` ADD COLUMN `pincode` INT NULL;
-
+ALTER TABLE `users` ADD COLUMN `pincode` INT NULL;
\ No newline at end of file
diff --git a/[esx]/async/LICENSE b/[esx]/async/LICENSE
index 4c37e893..bde4f52b 100644
--- a/[esx]/async/LICENSE
+++ b/[esx]/async/LICENSE
@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
async
- Copyright (C) 2015-2022 Jérémie N'gadi
+ Copyright (C) 2015-2023 Jérémie N'gadi
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
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
- async Copyright (C) 2015-2022 Jérémie N'gadi
+ async Copyright (C) 2015-2023 Jérémie N'gadi
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
diff --git a/[esx]/async/README.md b/[esx]/async/README.md
index 9c76d28d..90afcc36 100644
--- a/[esx]/async/README.md
+++ b/[esx]/async/README.md
@@ -6,7 +6,7 @@ A very Simple resource that allows resources to run tasks asynchronously.
async - asynchronous tasks.
-Copyright (C) 2015-2022 Jérémie N'gadi
+Copyright (C) 2015-2023 Jérémie N'gadi
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/[esx]/cron/LICENSE b/[esx]/cron/LICENSE
index 0f8d5811..e3b0b61c 100644
--- a/[esx]/cron/LICENSE
+++ b/[esx]/cron/LICENSE
@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
cron
- Copyright (C) 2015-2022 Jérémie N'gadi
+ Copyright (C) 2015-2023 Jérémie N'gadi
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
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
- cron Copyright (C) 2015-2022 Jérémie N'gadi
+ cron Copyright (C) 2015-2023 Jérémie N'gadi
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
diff --git a/[esx]/cron/README.md b/[esx]/cron/README.md
index 6dfe285b..e5291b69 100644
--- a/[esx]/cron/README.md
+++ b/[esx]/cron/README.md
@@ -28,7 +28,7 @@ TriggerEvent('cron:runAt', 18, 30, CronTask)
cron - run tasks at specific intervals!
-Copyright (C) 2015-2022 Jérémie N'gadi
+Copyright (C) 2015-2023 Jérémie N'gadi
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/[esx]/es_extended/LICENSE b/[esx]/es_extended/LICENSE
index 53bf50d0..a10f2d96 100644
--- a/[esx]/es_extended/LICENSE
+++ b/[esx]/es_extended/LICENSE
@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
es_extended
- Copyright (C) 2015-2022 Jérémie N'gadi
+ Copyright (C) 2015-2023 Jérémie N'gadi
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
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
- es_extended Copyright (C) 2015-2022 Jérémie N'gadi
+ es_extended Copyright (C) 2015-2023 Jérémie N'gadi
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
diff --git a/[esx]/es_extended/client/common.lua b/[esx]/es_extended/client/common.lua
index 26020ace..c088fb90 100644
--- a/[esx]/es_extended/client/common.lua
+++ b/[esx]/es_extended/client/common.lua
@@ -5,3 +5,8 @@ end)
if GetResourceState('ox_inventory') ~= 'missing' then
Config.OxInventory = true
end
+
+AddEventHandler("esx:getSharedObject", function()
+ local Invoke = GetInvokingResource()
+ print(("[^1ERROR^7] Resource ^5%s^7 Used the ^5getSharedObject^7 Event, this event ^1no longer exists!^7 Visit https://documentation.esx-framework.org/tutorials/sharedevent for how to fix!"):format(Invoke))
+end)
diff --git a/[esx]/es_extended/client/functions.lua b/[esx]/es_extended/client/functions.lua
index 83489795..5403abcd 100644
--- a/[esx]/es_extended/client/functions.lua
+++ b/[esx]/es_extended/client/functions.lua
@@ -1087,6 +1087,10 @@ function ESX.Game.Utils.DrawText3D(coords, text, size, font)
end
function ESX.ShowInventory()
+ if not Config.EnableDefaultInventory then
+ return
+ end
+
local playerPed = ESX.PlayerData.ped
local elements = {
{unselectable = true, icon = 'fas fa-box', title = 'Player Inventory'}
diff --git a/[esx]/es_extended/locales/de.lua b/[esx]/es_extended/locales/de.lua
index 944c00ce..1401ce14 100644
--- a/[esx]/es_extended/locales/de.lua
+++ b/[esx]/es_extended/locales/de.lua
@@ -1,15 +1,15 @@
Locales['de'] = {
-- Inventory
- ['inventory'] = 'inventar %s / %s',
+ ['inventory'] = 'Inventar %s / %s',
['use'] = 'benutzen',
['give'] = 'geben',
['remove'] = 'entfernen',
['return'] = 'zurück',
['give_to'] = 'geben an',
- ['amount'] = 'betrag',
- ['giveammo'] = 'munition geben',
- ['amountammo'] = 'anzahl der munition',
- ['noammo'] = 'du hast keine munition!',
+ ['amount'] = 'Betrag',
+ ['giveammo'] = 'Munition geben',
+ ['amountammo'] = 'Anzahl der Munition',
+ ['noammo'] = 'du hast keine Munition!',
['gave_item'] = 'du gibst %sx %s an %s',
['received_item'] = 'du empfängst %sx %s von %s',
['gave_weapon'] = 'du gibst %s an %s',
@@ -26,9 +26,9 @@ Locales['de'] = {
['received_account_money'] = 'du empfängst $%s (%s) von %s',
['amount_invalid'] = 'ungültiger Betrag',
['players_nearby'] = 'keine Spieler in der Nähe',
- ['ex_inv_lim'] = 'aktion nicht möglich, Inventarlimit überschritten für %s',
- ['imp_invalid_quantity'] = 'aktion nicht möglich, ungültige Anzahl',
- ['imp_invalid_amount'] = 'aktion nicht möglich, ungültiger Betrag',
+ ['ex_inv_lim'] = 'Aktion nicht möglich, Inventarlimit überschritten für %s',
+ ['imp_invalid_quantity'] = 'Aktion nicht möglich, ungültige Anzahl',
+ ['imp_invalid_amount'] = 'Aktion nicht möglich, ungültiger Betrag',
['threw_standard'] = 'du wirfst %sx %s',
['threw_account'] = 'du wirfst $%s %s weg',
['threw_weapon'] = 'du wirfst %s weg',
@@ -38,71 +38,71 @@ Locales['de'] = {
['threw_pickup_prompt'] = 'drücke E um aufzuheben',
-- Key mapping
- ['keymap_showinventory'] = 'inventar anzeigen',
+ ['keymap_showinventory'] = 'Inventar anzeigen',
-- Salary related
['received_salary'] = 'du hast dein Gehalt erhalten: $%s',
['received_help'] = 'du hast deine Sozialhilfe erhalten: $%s',
- ['company_nomoney'] = 'die Firma in der du angestellt bist, ist zu arm um dein Gehalt zu zahlen',
+ ['company_nomoney'] = 'die Firma in der du angestellt bist, ist zu arm um dir dein Gehalt zu zahlen',
['received_paycheck'] = 'erhaltener Gehaltsscheck',
- ['bank'] = 'bank',
- ['account_bank'] = 'bank',
- ['account_black_money'] = 'schwarzgeld',
- ['account_money'] = 'geld',
+ ['bank'] = 'Bank',
+ ['account_bank'] = 'Bank',
+ ['account_black_money'] = 'Schwarzgeld',
+ ['account_money'] = 'Geld',
['act_imp'] = 'Aktion nicht möglich',
['in_vehicle'] = 'du kannst keine Items in einem Fahrzeug weitergeben',
-- Commands
- ['command_car'] = 'fahrzeug spawnen',
- ['command_car_car'] = 'fahrzeug spawn name oder hash',
- ['command_cardel'] = 'fahrzeuge in der nähe löschen',
- ['command_cardel_radius'] = 'optional, jedes fahrzeug innerhalb des angegebenen radius löschen',
- ['command_clear'] = 'chat leeren',
- ['command_clearall'] = 'chat leeren für alle spieler',
- ['command_clearinventory'] = 'spieler inventar leeren',
- ['command_clearloadout'] = 'spieler ausstattung löschen',
- ['command_giveaccountmoney'] = 'gebe guthaben',
- ['command_giveaccountmoney_account'] = 'gültiger account name',
- ['command_giveaccountmoney_amount'] = 'anzahl zum hinzufügen',
- ['command_giveaccountmoney_invalid'] = 'ungültiger account name',
- ['command_giveitem'] = 'gebe ein item zu einem spieler',
- ['command_giveitem_item'] = 'item name',
- ['command_giveitem_count'] = 'item anzahl',
- ['command_giveweapon'] = 'gebe waffe zu einem spieler',
- ['command_giveweapon_weapon'] = 'waffen name',
- ['command_giveweapon_ammo'] = 'munition anzahl',
- ['command_giveweapon_hasalready'] = 'spieler hat bereits diese waffe',
- ['command_giveweaponcomponent'] = 'gebe waffen component',
- ['command_giveweaponcomponent_component'] = 'component name',
- ['command_giveweaponcomponent_invalid'] = 'ungültiges waffen component',
- ['command_giveweaponcomponent_hasalready'] = 'spieler hat bereits dieses waffen komponent',
- ['command_giveweaponcomponent_missingweapon'] = 'spieler hat diese waffe nicht',
- ['command_save'] = 'spieler in die datenbank sichern',
- ['command_saveall'] = 'alle spieler in die datenbank sichern',
- ['command_setaccountmoney'] = 'guthaben für den spieler setzen',
- ['command_setaccountmoney_amount'] = 'guthaben zum setzen',
- ['command_setcoords'] = 'teleportieren zu koordinaten',
- ['command_setcoords_x'] = 'x axis',
- ['command_setcoords_y'] = 'y axis',
- ['command_setcoords_z'] = 'z axis',
- ['command_setjob'] = 'job für einen spieler setzen',
- ['command_setjob_job'] = 'job name',
- ['command_setjob_grade'] = 'job rang',
- ['command_setjob_invalid'] = 'der job, rang oder beides ist ungültig',
- ['command_setgroup'] = 'setze spieler gruppe',
- ['command_setgroup_group'] = 'gruppen name',
- ['commanderror_argumentmismatch'] = 'argumentanzahl stimmt nicht überein (übergeben %s, gesucht %s)',
+ ['command_car'] = 'Fahrzeug spawnen',
+ ['command_car_car'] = 'Fahrzeug spawnname oder hash',
+ ['command_cardel'] = 'Fahrzeuge in der nähe löschen',
+ ['command_cardel_radius'] = 'Optional, jedes Fahrzeug innerhalb des angegebenen Radius löschen',
+ ['command_clear'] = 'Chat leeren',
+ ['command_clearall'] = 'Chat leeren für alle spieler',
+ ['command_clearinventory'] = 'Spielerinventar leeren',
+ ['command_clearloadout'] = 'Spielerausstattung löschen',
+ ['command_giveaccountmoney'] = 'Geld aufs Konto laden',
+ ['command_giveaccountmoney_account'] = 'gültiger Kontoname',
+ ['command_giveaccountmoney_amount'] = 'Anzahl zum hinzufügen',
+ ['command_giveaccountmoney_invalid'] = 'Ungültiger Kontoname',
+ ['command_giveitem'] = 'Item an Spieler geben',
+ ['command_giveitem_item'] = 'Itemname',
+ ['command_giveitem_count'] = 'item Anzahl',
+ ['command_giveweapon'] = 'Spieler eine Waffe geben',
+ ['command_giveweapon_weapon'] = 'Waffenname',
+ ['command_giveweapon_ammo'] = 'Munitionsanzahl',
+ ['command_giveweapon_hasalready'] = 'Spieler bereits im Besitz dieser Waffe',
+ ['command_giveweaponcomponent'] = 'Spieler Waffenaufsatz geben',
+ ['command_giveweaponcomponent_component'] = 'Waffenaufsatz Name',
+ ['command_giveweaponcomponent_invalid'] = 'ungültiger Waffenaufsatz',
+ ['command_giveweaponcomponent_hasalready'] = 'Spieler hat bereits diesen Waffenaufsatz',
+ ['command_giveweaponcomponent_missingweapon'] = 'Der Spieler besitzt diese Waffe nicht',
+ ['command_save'] = 'Spieler in der Datenbank sichern',
+ ['command_saveall'] = 'Sichern von allen Spielern auf der Datenbank',
+ ['command_setaccountmoney'] = 'Kontosumme des Spielers setzen',
+ ['command_setaccountmoney_amount'] = 'Summe',
+ ['command_setcoords'] = 'Zu den Koordinaten Teleportieren',
+ ['command_setcoords_x'] = 'x Position',
+ ['command_setcoords_y'] = 'y Position',
+ ['command_setcoords_z'] = 'z Position',
+ ['command_setjob'] = 'Dem Spieler einen Job setzen',
+ ['command_setjob_job'] = 'Name des Jobs',
+ ['command_setjob_grade'] = 'Rang des Jobs',
+ ['command_setjob_invalid'] = 'Der Rang oder der Job ist nicht gültigt.',
+ ['command_setgroup'] = 'Spielergruppe setzen',
+ ['command_setgroup_group'] = 'Gruppenname',
+ ['commanderror_argumentmismatch'] = 'Die Anzahl der Argumente stimmen nicht überein (übergeben %s, gesucht %s)',
['commanderror_argumentmismatch_number'] = 'argument #%s typ stimmt nicht überein (übergeben string, gewünscht zahl)',
- ['commanderror_invaliditem'] = 'falscher item name',
- ['commanderror_invalidweapon'] = 'ungültige waffe',
- ['commanderror_console'] = 'der command kann nicht von der konsole ausgeführt werden',
- ['commanderror_invalidcommand'] = '/%s ist kein verfügbarer command!',
- ['commanderror_invalidplayerid'] = 'kein spieler ist online mit dieser id',
- ['commandgeneric_playerid'] = 'spieler id',
- ['command_giveammo_noweapon_found'] = '%s does not have that weapon',
- ['command_giveammo_weapon'] = 'Weapon name',
- ['command_giveammo_ammo'] = 'Ammo Quantity',
+ ['commanderror_invaliditem'] = 'falscher Itemname',
+ ['commanderror_invalidweapon'] = 'ungültige Waffe',
+ ['commanderror_console'] = 'Der Befehl kann nicht in der Konsole genutzt werden',
+ ['commanderror_invalidcommand'] = '/%s ist kein verfügbarer Befehl!',
+ ['commanderror_invalidplayerid'] = 'Kein Spieler mit dieser ID scheint online zu sein',
+ ['commandgeneric_playerid'] = 'Spieler ID',
+ ['command_giveammo_noweapon_found'] = '%s besitzt diese Waffe nicht',
+ ['command_giveammo_weapon'] = 'Waffenname',
+ ['command_giveammo_ammo'] = 'Munitionsanzahl',
-- Locale settings
['locale_digit_grouping_symbol'] = ' ',
@@ -187,34 +187,34 @@ Locales['de'] = {
-- Weapon Components
['component_clip_default'] = 'standart Griff',
['component_clip_extended'] = 'erweiterter Griff',
- ['component_clip_drum'] = 'trommelmagazin',
- ['component_clip_box'] = 'kastenmagazin',
- ['component_flashlight'] = 'taschenlampe',
- ['component_scope'] = 'zielfernrohr',
+ ['component_clip_drum'] = 'Trommelmagazin',
+ ['component_clip_box'] = 'Kastenmagazin',
+ ['component_flashlight'] = 'Taschenlampe',
+ ['component_scope'] = 'Zielfernrohr',
['component_scope_advanced'] = 'erweitertes Zielfernrohr',
- ['component_suppressor'] = 'schalldämpfer',
- ['component_grip'] = 'griff',
- ['component_luxary_finish'] = 'luxus Waffen Design',
+ ['component_suppressor'] = 'Schalldämpfer',
+ ['component_grip'] = 'Griff',
+ ['component_luxary_finish'] = 'luxus Waffendesign',
-- Weapon Ammo
- ['ammo_rounds'] = 'kugel(n)',
- ['ammo_shells'] = 'schrotpatrone(n)',
- ['ammo_charge'] = 'ladung',
- ['ammo_petrol'] = 'liter Benzin',
- ['ammo_firework'] = 'feuerwerksrakete(n)',
- ['ammo_rockets'] = 'rakete(n)',
- ['ammo_grenadelauncher'] = 'granate(n)',
- ['ammo_grenade'] = 'granate(n)',
- ['ammo_stickybomb'] = 'bombe(n)',
- ['ammo_pipebomb'] = 'bombe(n)',
- ['ammo_smokebomb'] = 'bombe(n)',
- ['ammo_molotov'] = 'cocktail(s)',
- ['ammo_proxmine'] = 'mine(n)',
- ['ammo_bzgas'] = 'can(n)',
- ['ammo_ball'] = 'ball',
- ['ammo_snowball'] = 'schneebälle',
- ['ammo_flare'] = 'signalfackel(n)',
- ['ammo_flaregun'] = 'signalfackeln(munition)',
+ ['ammo_rounds'] = 'Kugel(n)',
+ ['ammo_shells'] = 'Schrotpatrone(n)',
+ ['ammo_charge'] = 'Ladung',
+ ['ammo_petrol'] = 'Benzinkanister',
+ ['ammo_firework'] = 'Feuerwerksrakete(n)',
+ ['ammo_rockets'] = 'Rakete(n)',
+ ['ammo_grenadelauncher'] = 'Granate(n)',
+ ['ammo_grenade'] = 'Granate(n)',
+ ['ammo_stickybomb'] = 'C4(s)',
+ ['ammo_pipebomb'] = 'Rohrbombe(n)',
+ ['ammo_smokebomb'] = 'Rauchgranate(n)',
+ ['ammo_molotov'] = 'Molotovcocktail(s)',
+ ['ammo_proxmine'] = 'Annäherungsmine(n)',
+ ['ammo_bzgas'] = 'Bzgas',
+ ['ammo_ball'] = 'Ball',
+ ['ammo_snowball'] = 'Schneebälle',
+ ['ammo_flare'] = 'Signalfackel(n)',
+ ['ammo_flaregun'] = 'Signalfackeln(munition)',
-- Weapon Tints
['tint_default'] = 'standard',
diff --git a/[esx]/es_extended/server/common.lua b/[esx]/es_extended/server/common.lua
index c8d004b4..6aaf87c8 100644
--- a/[esx]/es_extended/server/common.lua
+++ b/[esx]/es_extended/server/common.lua
@@ -14,6 +14,10 @@ Core.Pickups = {}
Core.PickupId = 0
Core.PlayerFunctionOverrides = {}
+AddEventHandler("esx:getSharedObject", function()
+ local Invoke = GetInvokingResource()
+ print(("[^1ERROR^7] Resource ^5%s^7 Used the ^5getSharedObject^7 Event, this event ^1no longer exists!^7 Visit https://documentation.esx-framework.org/tutorials/sharedevent for how to fix!"):format(Invoke))
+end)
exports('getSharedObject', function()
return ESX
diff --git a/[esx]/es_extended/server/main.lua b/[esx]/es_extended/server/main.lua
index 52a6f6f7..8b4c00d3 100644
--- a/[esx]/es_extended/server/main.lua
+++ b/[esx]/es_extended/server/main.lua
@@ -99,14 +99,14 @@ if not Config.Multichar then
if identifier then
if ESX.GetPlayerFromIdentifier(identifier) then
deferrals.done(
- ('There was an error loading your character!\nError code: identifier-active\n\nThis error is caused by a player on this server who has the same identifier as you have. Make sure you are not playing on the same account.\n\nYour identifier: %s'):format(
+ ('[ESX] There was an error loading your character!\nError code: identifier-active\n\nThis error is caused by a player on this server who has the same identifier as you have. Make sure you are not playing on the same account.\n\nYour identifier: %s'):format(
identifier))
else
deferrals.done()
end
else
deferrals.done(
- 'There was an error loading your character!\nError code: identifier-missing\n\nThe cause of this error is not known, your identifier could not be found. Please come back later or report this problem to the server administration team.')
+ '[ESX] There was an error loading your character!\nError code: identifier-missing\n\nThe cause of this error is not known, your identifier could not be found. Please come back later or report this problem to the server administration team.')
end
end)
end
@@ -133,9 +133,9 @@ function loadESXPlayer(identifier, playerId, isNew)
end
local index = #userData.accounts + 1
userData.accounts[index] = {
- name = account,
+ name = account,
money = foundAccounts[account] or Config.StartingAccountMoney[account] or 0,
- label = data.label,
+ label = data.label,
round = data.round,
index = index
}
@@ -299,13 +299,13 @@ function loadESXPlayer(identifier, playerId, isNew)
xPlayer.triggerEvent('esx:playerLoaded',
{
- accounts = xPlayer.getAccounts(),
- coords = xPlayer.getCoords(),
- identifier = xPlayer.getIdentifier(),
+ accounts = xPlayer.getAccounts(),
+ coords = xPlayer.getCoords(),
+ identifier = xPlayer.getIdentifier(),
inventory = xPlayer.getInventory(),
- job = xPlayer.getJob(),
- loadout = xPlayer.getLoadout(),
- maxWeight = xPlayer.getMaxWeight(),
+ job = xPlayer.getJob(),
+ loadout = xPlayer.getLoadout(),
+ maxWeight = xPlayer.getMaxWeight(),
money = xPlayer.getMoney(),
sex = xPlayer.get("sex") or "m",
firstName = xPlayer.get("firstName") or "John",
diff --git a/[esx]/esx_context/LICENSE b/[esx]/esx_context/LICENSE
index 357d9c56..4b046bd2 100644
--- a/[esx]/esx_context/LICENSE
+++ b/[esx]/esx_context/LICENSE
@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
esx_boat
- Copyright (C) 2015-2022 Jérémie N'gadi
+ Copyright (C) 2015-2023 Jérémie N'gadi
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
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
- esx_boat Copyright (C) 2015-2022 Jérémie N'gadi
+ esx_boat Copyright (C) 2015-2023 Jérémie N'gadi
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
diff --git a/[esx]/esx_identity/LICENSE b/[esx]/esx_identity/LICENSE
index 9cba2328..4dc529f0 100644
--- a/[esx]/esx_identity/LICENSE
+++ b/[esx]/esx_identity/LICENSE
@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
esx_identity
- Copyright (C) 2015-2022 Jérémie N'gadi
+ Copyright (C) 2015-2023 Jérémie N'gadi
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
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
- esx_identity Copyright (C) 2015-2022 Jérémie N'gadi
+ esx_identity Copyright (C) 2015-2023 Jérémie N'gadi
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
diff --git a/[esx]/esx_identity/README.md b/[esx]/esx_identity/README.md
index f4053cad..404bba66 100644
--- a/[esx]/esx_identity/README.md
+++ b/[esx]/esx_identity/README.md
@@ -21,7 +21,7 @@ A Core Resource that Allows the player to Pick their characters, Name, Gender, H
esx_identity - Make your Character a Person!
-Copyright (C) 2015-2022 Jérémie N'gadi
+Copyright (C) 2015-2023 Jérémie N'gadi
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/[esx]/esx_identity/config.lua b/[esx]/esx_identity/config.lua
index 8cdd9bb7..8eeb007c 100644
--- a/[esx]/esx_identity/config.lua
+++ b/[esx]/esx_identity/config.lua
@@ -17,7 +17,7 @@ Config.MaxNameLength = 20 -- Max Name Length.
Config.MinHeight = 120 -- 120 cm lowest height
Config.MaxHeight = 220 -- 220 cm max height.
Config.LowestYear = 1900 -- 112 years old is the oldest you can be.
-Config.HighestYear = 2003 -- 18 years old is the youngest you can be.
+Config.HighestYear = 2005 -- 18 years old is the youngest you can be.
Config.FullCharDelete = true -- Delete all reference to character.
Config.EnableDebugging = ESX.GetConfig().EnableDebug -- prints for debugging :)
diff --git a/[esx]/esx_loadingscreen/LICENSE b/[esx]/esx_loadingscreen/LICENSE
index 1e4d06cf..85ce0959 100644
--- a/[esx]/esx_loadingscreen/LICENSE
+++ b/[esx]/esx_loadingscreen/LICENSE
@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
esx_menu_default
- Copyright (C) 2015-2022 Jérémie N'gadi
+ Copyright (C) 2015-2023 Jérémie N'gadi
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
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
- esx_menu_default Copyright (C) 2015-2022 Jérémie N'gadi
+ esx_menu_default Copyright (C) 2015-2023 Jérémie N'gadi
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
diff --git a/[esx]/esx_loadingscreen/README.md b/[esx]/esx_loadingscreen/README.md
index 887a000d..d5925203 100644
--- a/[esx]/esx_loadingscreen/README.md
+++ b/[esx]/esx_loadingscreen/README.md
@@ -6,7 +6,7 @@ A simple but beautiful Loading Screen for your server!
esx_loadingscreen - Loading in style!
-Copyright (C) 2022 ESX-Framework
+Copyright (C) 2023 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/[esx]/esx_loadingscreen/css/index.css b/[esx]/esx_loadingscreen/css/index.css
index 9520df8e..6cb39671 100644
--- a/[esx]/esx_loadingscreen/css/index.css
+++ b/[esx]/esx_loadingscreen/css/index.css
@@ -12,102 +12,106 @@
* This copyright should appear in every part of the project code
*/
-html,body {
-
- margin: 0;
- padding: 0;
- font-family: 'Quicksand', sans-serif;
- overflow: hidden;
-
+html,
+body {
+ margin: 0;
+ padding: 0;
+ font-family: "Quicksand", sans-serif;
+ overflow: hidden;
}
#esx_intro {
-
- z-index: 2;
-
+ z-index: 2;
}
#esx_loop {
-
- z-index: 1;
-
+ z-index: 1;
}
#loading_txt {
+ bottom: 5%;
+ left: 50%;
+ margin-left: -80px;
+ position: absolute;
+ z-index: 999;
- bottom: 5%;
- left: 50%;
- margin-left: -80px;
- position: absolute;
- z-index: 999;
-
- -webkit-animation: fadein 5s;
- -moz-animation: fadein 5s;
- -ms-animation: fadein 5s;
- -o-animation: fadein 5s;
- animation: fadein 5s;
-
+ -webkit-animation: fadein 5s;
+ -moz-animation: fadein 5s;
+ -ms-animation: fadein 5s;
+ -o-animation: fadein 5s;
+ animation: fadein 5s;
}
p {
-
- color: white;
- font-size: 32px;
-
+ color: white;
+ font-size: 32px;
}
.text_thing:after {
- content: ' .';
- animation: dots 2s steps(5, end) infinite;
+ content: " .";
+ animation: dots 2s steps(5, end) infinite;
}
@keyframes dots {
- 0%, 20% {
- color: rgba(0,0,0,0);
- text-shadow:
- .25em 0 0 rgba(0,0,0,0),
- .5em 0 0 rgba(0,0,0,0);
- }
- 40% {
- color: white;
- text-shadow:
- .25em 0 0 rgba(0,0,0,0),
- .5em 0 0 rgba(0,0,0,0);
- }
- 60% {
- text-shadow:
- .25em 0 0 white,
- .5em 0 0 rgba(0,0,0,0);
- }
- 80%, 100% {
- text-shadow:
- .25em 0 0 white,
- .5em 0 0 white;
- }
+ 0%,
+ 20% {
+ color: rgba(0, 0, 0, 0);
+ text-shadow: 0.25em 0 0 rgba(0, 0, 0, 0), 0.5em 0 0 rgba(0, 0, 0, 0);
+ }
+ 40% {
+ color: white;
+ text-shadow: 0.25em 0 0 rgba(0, 0, 0, 0), 0.5em 0 0 rgba(0, 0, 0, 0);
+ }
+ 60% {
+ text-shadow: 0.25em 0 0 white, 0.5em 0 0 rgba(0, 0, 0, 0);
+ }
+ 80%,
+ 100% {
+ text-shadow: 0.25em 0 0 white, 0.5em 0 0 white;
+ }
}
-
@keyframes fadein {
- from { opacity: 0; }
- to { opacity: 1; }
+ from {
+ opacity: 0;
+ }
+ to {
+ opacity: 1;
+ }
}
@-moz-keyframes fadein {
- from { opacity: 0; }
- to { opacity: 1; }
+ from {
+ opacity: 0;
+ }
+ to {
+ opacity: 1;
+ }
}
@-webkit-keyframes fadein {
- from { opacity: 0; }
- to { opacity: 1; }
+ from {
+ opacity: 0;
+ }
+ to {
+ opacity: 1;
+ }
}
@-ms-keyframes fadein {
- from { opacity: 0; }
- to { opacity: 1; }
+ from {
+ opacity: 0;
+ }
+ to {
+ opacity: 1;
+ }
}
@-o-keyframes fadein {
- from { opacity: 0; }
- to { opacity: 1; }
+ from {
+ opacity: 0;
+ }
+ to {
+ opacity: 1;
+ }
}
diff --git a/[esx]/esx_loadingscreen/index.html b/[esx]/esx_loadingscreen/index.html
index ced82440..212b9e7e 100644
--- a/[esx]/esx_loadingscreen/index.html
+++ b/[esx]/esx_loadingscreen/index.html
@@ -1,28 +1,25 @@
-
-
-
+
-
-
+
-
-
-
+
+