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

Version Bump for 1.6.5

Browse Source
This commit is contained in:
Mycroft
2022-03-23 16:22:46 +00:00
parent cacf7804f3
commit 8e82543933
51 changed files with 84 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
[SQL]/legacy.sql
+14
View File
@@ -112,6 +112,19 @@ CREATE TABLE `cardealer_vehicles` (
-- --------------------------------------------------------
--
-- Table structure for table `multicharacter_slots`
--
CREATE TABLE `multicharacter_slots` (
`identifier` VARCHAR(60) NOT NULL,
`slots` INT(11) NOT NULL,
PRIMARY KEY (`identifier`) USING BTREE,
INDEX `slots` (`slots`) USING BTREE
) ENGINE=InnoDB;
-- --------------------------------------------------------
--
-- Table structure for table `datastore`
--
@@ -501,6 +514,7 @@ CREATE TABLE `users` (
`status` longtext DEFAULT NULL,
`is_dead` tinyint(1) DEFAULT 0,
`id` int(11) NOT NULL,
`disabled` TINYINT(1) NULL DEFAULT '0',
`last_property` varchar(255) DEFAULT NULL
) ENGINE=InnoDB;
[esx]/es_extended/config.lua
+1 -1
View File
@@ -18,5 +18,5 @@ 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 = false -- Enable support for esx_multicharacter
Config.Multichar = true -- Enable support for esx_multicharacter
Config.Identity = true -- Select a characters identity data before they have loaded in (this happens by default with multichar)
[esx]/es_extended/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ES Extended'
version '1.6.0'
version '1.6.5'
shared_scripts {
'locale.lua',
[esx]/es_extended/version.json
+2 -2
View File
@@ -1,5 +1,5 @@
{
"version": "legacy",
"commit" : "1.4.2",
"changelog": "\n- Updated `Car` Command. Fixed some vulnerabilities. Fix SQL. Updated Commands."
"commit" : "1.6.5",
"changelog": "\n- Add ESX Mulitcharacter"
}
[esx]/esx_identity/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Identity'
version '1.6.0'
version '1.6.5'
shared_script '@es_extended/imports.lua'
[esx]/esx_menu_default/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Menu Default'
version '1.6.0'
version '1.6.5'
client_scripts {
'@es_extended/imports.lua',
[esx]/esx_menu_dialog/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Menu Dialog'
version '1.6.0'
version '1.6.5'
client_scripts {
'@es_extended/imports.lua',
[esx]/esx_menu_list/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Menu List'
version '1.6.0'
version '1.6.5'
client_scripts {
'@es_extended/imports.lua',
[esx]/esx_multicharacter/fxmanifest.lua
+2 -2
View File
@@ -1,7 +1,7 @@
fx_version 'cerulean'
game 'gta5'
description 'https://github.com/thelindat/esx_multicharacter'
version '1.4.2'
description 'Official Multicharacter System For ESX Legacy'
version '1.6.5'
lua54 'yes'
dependencies {
[esx]/esx_multicharacter/readme.md
+19 -32
View File
@@ -1,59 +1,49 @@
### Requirements (ensure you are using the latest)
- [ESX Legacy](https://github.com/esx-framework/esx-legacy)
- [OxMySQL](https://github.com/overextended/oxmysql/releases)
### Conflicts
* The following resources should not be used with ESX Legacy and can result in errors
- essentialmode
- basic-gamemode
- fivem-map-skater
- fivem-map-hipster
- default_spawnpoint
# Preview
### Installation
- Modify your ESX config with `Config.Multichar = true`
- Run `esx_multicharacter.sql` into your database
- All owner and identifier columns should be set to `VARCHAR(60)` to ensure correct data entry
- The resource will attempt to set columns automatically
#### The menu is esx_menu_default - you can use any version if you want a different appearance
![image](https://user-images.githubusercontent.com/65407488/126976325-17cc3241-bb9e-451f-a6ed-610a8ef52fa5.png)
## Installation
- Modify your ESX config with `Config.Multichar = true`
- All owner and identifier columns should be set to `VARCHAR(60)` to ensure correct data entry
- The resource will attempt to set columns automatically
### Relogging
- Do not enable this setting if you do not intend to properly set up relog support
- Requires the latest update for ESX Status (prevents multiple status ticks from running)
- Add the following events to resources that require support for relogging, or
- Add them to [@es_extended/imports.lua](https://github.com/esx-framework/esx-legacy/blob/main/[esx]/es_extended/imports.lua) (and use the imports in your resources)
```lua
RegisterNetEvent('esx:playerLoaded', function(xPlayer)
ESX.PlayerData = xPlayer
ESX.PlayerLoaded = true
ESX.PlayerData = xPlayer
ESX.PlayerLoaded = true
end)
RegisterNetEvent('esx:onPlayerLogout', function()
ESX.PlayerLoaded = false
ESX.PlayerData = {}
ESX.PlayerLoaded = false
ESX.PlayerData = {}
end)
```
### Notes
- This resource is not compatible with ExtendedMode or previous versions of ESX
- Legacy, skin, and identity must be updated to at least the minimum commits specified above
- Characters are stored in the users table as `char#:license` - if you need to use a different identifier then you need to modify ESX itself
- Character deletion does not require manual entries for the tables to remove
- As characters are stored with unique identifiers, there is no excessive queries being executed
### Kashacters
- This project is forked from the [kashacters multicharacter resource](https://github.com/FiveEYZ/esx_kashacter)
- Most of the code has been entirely rewritten
- KASH has given permission for this resource to use his code and the addition of a license
- The license obviously does not apply to previous versions and KASH has stated his resource is free to be used however
## Notice
Copyright © 2021 Linden <https://github.com/thelindat/> and KASH
Copyright © 2022 [Linden](https://github.com/thelindat/), ESX-Framework (fournier Brice & Jérémie N'gadi) and KASH
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
@@ -66,7 +56,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see https://www.gnu.org/licenses.
### Thanks to KASH, XxFri3ndlyxX, and all those who have contributed
along with this program. If not, see <https://www.gnu.org/licenses>.
[esx]/esx_skin/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Skin'
version '1.6.0'
version '1.6.5'
shared_script '@es_extended/imports.lua'
[esx_addons]/esx_accessories/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Accessories'
version '1.6.0'
version '1.6.5'
shared_script '@es_extended/imports.lua'
[esx_addons]/esx_addonaccount/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Addon Account'
version '1.6.0'
version '1.6.5'
server_scripts {
'@es_extended/imports.lua',
[esx_addons]/esx_addoninventory/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Addon Inventory'
version '1.6.0'
version '1.6.5'
server_scripts {
'@es_extended/imports.lua',
[esx_addons]/esx_ambulancejob/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Ambulance Job'
version '1.6.0'
version '1.6.5'
shared_script '@es_extended/imports.lua'
[esx_addons]/esx_animations/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Animations'
version '1.6.0'
version '1.6.5'
client_scripts {
'@es_extended/imports.lua',
[esx_addons]/esx_atm/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Atm'
version '1.6.0'
version '1.6.5'
shared_script '@es_extended/imports.lua'
[esx_addons]/esx_bankerjob/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Banker job'
version '1.6.0'
version '1.6.5'
shared_script '@es_extended/imports.lua'
[esx_addons]/esx_barbershop/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Barber Shop'
version '1.6.0'
version '1.6.5'
shared_script '@es_extended/imports.lua'
[esx_addons]/esx_basicneeds/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Basic Needs'
version '1.6.0'
version '1.6.5'
shared_script '@es_extended/imports.lua'
[esx_addons]/esx_billing/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Billing'
version '1.6.0'
version '1.6.5'
shared_script '@es_extended/imports.lua'
[esx_addons]/esx_boat/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Boat'
version '1.6.0'
version '1.6.5'
shared_script '@es_extended/imports.lua'
[esx_addons]/esx_clotheshop/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Clothes Shop'
version '1.6.0'
version '1.6.5'
shared_script '@es_extended/imports.lua'
[esx_addons]/esx_cruisecontrol/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'CruiseControl System for ESX'
version '1.6.0'
version '1.6.5'
dependencies {
'es_extended'
[esx_addons]/esx_datastore/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Data Store'
version '1.6.0'
version '1.6.5'
server_scripts {
'@es_extended/imports.lua',
[esx_addons]/esx_dmvschool/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX DMV School'
version '1.6.0'
version '1.6.5'
shared_script '@es_extended/imports.lua'
[esx_addons]/esx_drugs/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Drugs'
version '1.6.0'
version '1.6.5'
shared_script '@es_extended/imports.lua'
[esx_addons]/esx_garage/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Garage'
version '1.6.0'
version '1.6.5'
shared_script '@es_extended/imports.lua'
[esx_addons]/esx_holdup/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Holdup'
version '1.6.0'
version '1.6.5'
shared_script '@es_extended/imports.lua'
[esx_addons]/esx_joblisting/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Job Listing'
version '1.6.0'
version '1.6.5'
shared_script '@es_extended/imports.lua'
[esx_addons]/esx_jobs/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Jobs'
version '1.6.0'
version '1.6.5'
shared_script '@es_extended/imports.lua'
[esx_addons]/esx_license/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX License'
version '1.6.0'
version '1.6.5'
server_scripts {
'@async/async.lua',
[esx_addons]/esx_lscustom/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX LS Customs'
version '1.6.0'
version '1.6.5'
shared_script '@es_extended/imports.lua'
[esx_addons]/esx_mechanicjob/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Mechanic Job'
version '1.6.0'
version '1.6.5'
shared_script '@es_extended/imports.lua'
[esx_addons]/esx_optionalneeds/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Optional Needs'
version '1.6.0'
version '1.6.5'
shared_script '@es_extended/imports.lua'
[esx_addons]/esx_phone/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Phone'
version '1.6.0'
version '1.6.5'
shared_script '@es_extended/imports.lua'
[esx_addons]/esx_policejob/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Police Job'
version '1.6.0'
version '1.6.5'
shared_script '@es_extended/imports.lua'
[esx_addons]/esx_property/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Property'
version '1.6.0'
version '1.6.5'
shared_script '@es_extended/imports.lua'
[esx_addons]/esx_realestateagentjob/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Real Estate Job'
version '1.6.0'
version '1.6.5'
shared_script '@es_extended/imports.lua'
[esx_addons]/esx_rpchat/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX RP Chat'
version '1.6.0'
version '1.6.5'
shared_script '@es_extended/imports.lua'
[esx_addons]/esx_service/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Service'
version '1.6.0'
version '1.6.5'
shared_script '@es_extended/imports.lua'
[esx_addons]/esx_shops/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Shops'
version '1.6.0'
version '1.6.5'
shared_script '@es_extended/imports.lua'
[esx_addons]/esx_sit/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Sit'
version '1.6.0'
version '1.6.5'
shared_script '@es_extended/imports.lua'
[esx_addons]/esx_society/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Society'
version '1.6.0'
version '1.6.5'
shared_script '@es_extended/imports.lua'
[esx_addons]/esx_status/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Status'
version '1.6.0'
version '1.6.5'
lua54 'yes'
[esx_addons]/esx_taxijob/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Taxi Job'
version '1.6.0'
version '1.6.5'
shared_script '@es_extended/imports.lua'
[esx_addons]/esx_vehicleshop/fxmanifest.lua
+1 -1
View File
@@ -6,7 +6,7 @@ lua54 'yes'
description 'ESX Vehicle Shop'
version '1.6.0'
version '1.6.5'
shared_script '@es_extended/imports.lua'
[esx_addons]/esx_voice/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Voice Controller'
version '1.6.0'
version '1.6.5'
client_scripts {
'@es_extended/imports.lua',
[esx_addons]/esx_weaponshop/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Weapon Shop'
version '1.6.0'
version '1.6.5'
shared_scripts {
'@es_extended/imports.lua',
[esx_addons]/esx_whitelist/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Whitelist'
version '1.6.0'
version '1.6.5'
server_scripts {
'@es_extended/imports.lua',
[esx_addons]/instance/fxmanifest.lua
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'Instance'
version '1.6.0'
version '1.6.5'
shared_script '@es_extended/imports.lua'