Squashed commit of the following:

mirror of https://github.com/esx-framework/esx_core.git synced 2026-08-28 17:01:14 +00:00
commit fffe62c047
Merge: 35899761 b7e5351f
Author: Benzo <102178921+Benzo00@users.noreply.github.com>
Date:   Wed Jan 18 14:16:02 2023 +0100

    Merge pull request #838 from Rav3n95/develop

    refactor(esx_banking)

commit 35899761ba
Merge: b09776b4 1d06e246
Author: Benzo <102178921+Benzo00@users.noreply.github.com>
Date:   Wed Jan 18 13:56:51 2023 +0100

    Merge pull request #834 from lexinor/patch-2

    refactor(esx_service/server/main.lua): Added some new globalstate stuff and fixed stuff

commit b09776b4c5
Merge: 3c4f81f9 18c4d704
Author: Benzo <102178921+Benzo00@users.noreply.github.com>
Date:   Wed Jan 18 13:51:46 2023 +0100

    Merge pull request #837 from esx-framework/esx_phone_removing

    build: remove esx_phone

commit 3c4f81f989
Merge: 3bc649d7 935eb8f2
Author: Benzo <102178921+Benzo00@users.noreply.github.com>
Date:   Wed Jan 18 13:40:43 2023 +0100

    Merge pull request #843 from PoPoGH/main

    Create fr.lua

commit 935eb8f2d6
Author: PoPo <76515395+PoPoGH@users.noreply.github.com>
Date:   Wed Jan 18 00:07:23 2023 +0100

    Update fr.lua

commit 06d17a6ddf
Author: PoPo <76515395+PoPoGH@users.noreply.github.com>
Date:   Wed Jan 18 00:06:03 2023 +0100

    add french locale

    some improvements

commit 811636cb58
Author: PoPo <76515395+PoPoGH@users.noreply.github.com>
Date:   Tue Jan 17 19:35:14 2023 +0100

    Add French Language

commit 3b7e4281dc
Author: PoPo <76515395+PoPoGH@users.noreply.github.com>
Date:   Tue Jan 17 15:09:10 2023 +0100

    Create fr.lua

commit b7e5351fcb
Author: Csoki <feketetibi71@gmail.com>
Date:   Mon Jan 16 13:38:55 2023 +0100

    fix(esx_banking/client): cant open if player death

    add 'esx:onPlayerDeath' event

commit 618eafc9a1
Author: Csoki <feketetibi71@gmail.com>
Date:   Mon Jan 16 13:26:22 2023 +0100

    Update README.md

    -remove: ox target support
    -format

commit 81c95b1a2b
Merge: 472f33bc 2e8871cc
Author: Csoki <feketetibi71@gmail.com>
Date:   Mon Jan 16 13:22:33 2023 +0100

    Merge branch 'develop' of https://github.com/Rav3n95/esx-legacy into pr/838

commit 472f33bcaf
Author: Csoki <feketetibi71@gmail.com>
Date:   Mon Jan 16 13:21:31 2023 +0100

    refactor(esx_banking/client): refactor some if  conditions

commit 8258d3fb6e
Author: P Gergő <paldi95@gmail.com>
Date:   Sat Jan 14 22:48:06 2023 +0100

    or 10

    fix: distance condition

commit 2e8871cc95
Author: P Gergő <paldi95@gmail.com>
Date:   Sat Jan 14 22:48:06 2023 +0100

    or 10

commit c70cd30922
Author: P Gergő <paldi95@gmail.com>
Date:   Sat Jan 14 22:39:06 2023 +0100

    refactor(esx_banking)

commit 3bc649d76b
Merge: 3568d2bf d300c1f0
Author: Gellipapa <gellerthorvath0@gmail.com>
Date:   Sat Jan 14 19:36:08 2023 +0100

    Merge pull request #832 from Flambaa/feat/tr-locale

    feat(esx_accsessories): Add tr locales/translation

commit 18c4d704e1
Author: Jean-Baptiste Devic <jean.baptiste.d06@gmail.com>
Date:   Sat Jan 14 13:52:41 2023 +0100

    build: remove esx_phone

commit 3568d2bf07
Merge: 00c0006e c503b078
Author: Csoki <feketetibi71@gmail.com>
Date:   Sat Jan 14 10:59:55 2023 +0100

    Merge pull request #835 from esx-framework/tony-stark-17-patch-1

    Send lastJob data to client

commit c503b07805
Author: Tony Stark <76168122+tony-stark-17@users.noreply.github.com>
Date:   Sat Jan 14 13:24:55 2023 +0530

    Send lastJob data to client

commit 1d06e246ab
Author: Alessandro Alterno <28725795+lexinor@users.noreply.github.com>
Date:   Fri Jan 13 22:47:26 2023 +0100

    Added some new globalstate stuff and fixed stuff

    - esx:playerDropped event was not working properly, source was not working, changed it to playerId
    - Added GlobalState[name] to make it easier to track onduty counters

commit d300c1f09a
Author: Flamba <denizakgxll@gmail.com>
Date:   Thu Jan 12 23:06:46 2023 +1100

    feat(esx_accsessories): Add tr locales/translation

commit 00c0006e93
Merge: cef3d217 d822a902
Author: Gellipapa <gellerthorvath0@gmail.com>
Date:   Wed Jan 11 00:41:02 2023 +0100

    Merge pull request #830 from fivemland/fix-779-2

    fix(esx_property): some fixes and refactor

commit d822a90273
Author: Csoki <feketetibi71@gmail.com>
Date:   Wed Dec 28 23:27:40 2022 +0100

    fix(esx_multicharacter): update 'hu' locales

    # add missing locales
    # add new locales PR #777

commit 58360836e7
Author: Csoki <feketetibi71@gmail.com>
Date:   Wed Dec 28 23:13:09 2022 +0100

    feat(esx_property): remove unused variables

commit 5ad4c1b2c0
Author: Csoki <feketetibi71@gmail.com>
Date:   Wed Dec 28 23:03:45 2022 +0100

    fix(esx_property): move 'es' locales to correct location

commit d1e64919ff
Author: Csoki <feketetibi71@gmail.com>
Date:   Wed Dec 28 22:56:50 2022 +0100

    feat(esx_property): update native names

commit cef3d2172f
Merge: 8030c9f9 99c8d116
Author: Gellipapa <gellerthorvath0@gmail.com>
Date:   Mon Jan 9 23:31:05 2023 +0100

    Merge pull request #794 from fivemland/society-refactor

    refactor(esx_society)

commit 8030c9f98f
Merge: fda62491 78200cee
Author: Gellipapa <gellerthorvath0@gmail.com>
Date:   Mon Jan 9 22:51:56 2023 +0100

    Merge pull request #829 from Gellipapa/fix-2

    fix(ex_extended locales.lua) fix nil value if change locales

commit 99c8d116b7
Author: Csoki <feketetibi71@gmail.com>
Date:   Mon Jan 9 22:51:27 2023 +0100

    fix

commit 78200cee9f
Author: Gellipapa <gellerthorvath0@gmail.com>
Date:   Mon Jan 9 22:47:23 2023 +0100

    fix nil value if change locales

commit 83833eb20c
Merge: 25016e8b fda62491
Author: Csoki <feketetibi71@gmail.com>
Date:   Mon Jan 9 22:44:46 2023 +0100

    Merge branch 'develop' into society-refactor

commit fda62491f4
Merge: e10494a3 163dd3b0
Author: Gellipapa <gellerthorvath0@gmail.com>
Date:   Mon Jan 9 22:27:09 2023 +0100

    Merge pull request #799 from TheFantomas/main

    New year licenses 🎈 🎈 🎈

commit e10494a382
Merge: 24d45560 53d2aa56
Author: Gellipapa <gellerthorvath0@gmail.com>
Date:   Mon Jan 9 22:08:00 2023 +0100

    Merge pull request #601 from AstroNext/AstroNext

    refactor(esx_menu_default/client/main.lua): Change isControlePress to ESX.RegisterInput

commit 24d4556019
Merge: 191088c8 f5e0115e
Author: Jean-Baptiste <jean.baptiste.d06@gmail.com>
Date:   Mon Jan 9 19:41:21 2023 +0100

    Merge pull request #823 from TheFantomas/main

    Add Feature Request and General Support

commit 191088c818
Merge: 58e48df5 21535af0
Author: Jean-Baptiste <jean.baptiste.d06@gmail.com>
Date:   Mon Jan 9 19:36:46 2023 +0100

    Merge pull request #827 from esx-framework/main

    make dev up to date

commit 58e48df514
Author: Benzo <102178921+Benzo00@users.noreply.github.com>
Date:   Mon Jan 9 11:25:42 2023 +0100

    Revert "Only show Default Inventory if Config enabled."

    This reverts commit 1abd1fb5b4.

commit ee09e06f1d
Merge: aa3032cf 23705a13
Author: JackDUpModZ <83776161+JackDUpModZ@users.noreply.github.com>
Date:   Mon Jan 9 10:09:29 2023 +0000

    Merge pull request #824 from Rav3n95/develop

    Fix for #821

commit aa3032cf23
Merge: b62be9ea c75e3a14
Author: JackDUpModZ <83776161+JackDUpModZ@users.noreply.github.com>
Date:   Mon Jan 9 10:08:40 2023 +0000

    Merge pull request #826 from iSentrie/patch-8

    fix(esx_lscustom): Added 5th engine level

commit c75e3a1400
Author: iSentrie <xvender7@gmail.com>
Date:   Mon Jan 9 11:29:25 2023 +0200

    Added 5th engine level

    Fix for vehicles that has 5 engine upgrades, example `shinobi`
    Prevents errors

commit 23705a135f
Author: P Gergő <69343477+Rav3n95@users.noreply.github.com>
Date:   Sun Jan 8 18:31:48 2023 +0100

    Forgotten print

commit dd634b66cc
Author: P Gergő <69343477+Rav3n95@users.noreply.github.com>
Date:   Sun Jan 8 18:30:58 2023 +0100

    Fixes

commit f5e0115e1e
Author: TheFarFantomas <thefarfantomas@gmail.com>
Date:   Sun Jan 8 17:55:09 2023 +0100

    Add tag

commit 8b9fb47eb0
Author: TheFarFantomas <thefarfantomas@gmail.com>
Date:   Sun Jan 8 17:53:29 2023 +0100

    Support

commit 15d8a337a9
Author: TheFarFantomas <thefarfantomas@gmail.com>
Date:   Sun Jan 8 17:50:40 2023 +0100

    Feature request

commit 163dd3b01c
Merge: ff5d728d b62be9ea
Author: TheFantomas <117121911+TheFantomas@users.noreply.github.com>
Date:   Sun Jan 8 17:33:26 2023 +0100

    Merge branch 'develop' into main

commit b62be9ea91
Merge: 13be7514 3ce03968
Author: JackDUpModZ <83776161+JackDUpModZ@users.noreply.github.com>
Date:   Sun Jan 8 16:09:36 2023 +0000

    Merge pull request #813 from zinzin92/main

    Create fr.lua

commit 13be751437
Merge: ddd19d0f effd9858
Author: JackDUpModZ <83776161+JackDUpModZ@users.noreply.github.com>
Date:   Sun Jan 8 16:07:54 2023 +0000

    Merge pull request #778 from johnsoul777/main

    Fix Translate Saving

commit ddd19d0ff1
Merge: c501f3f5 c4cc9843
Author: JackDUpModZ <83776161+JackDUpModZ@users.noreply.github.com>
Date:   Sun Jan 8 16:04:27 2023 +0000

    Merge pull request #811 from BeansFL/patch-3

    Update de.lua

commit c501f3f565
Merge: 86d03e7b 56992cd8
Author: JackDUpModZ <83776161+JackDUpModZ@users.noreply.github.com>
Date:   Sun Jan 8 16:03:55 2023 +0000

    Merge pull request #810 from BeansFL/patch-1

    Update de.lua

commit 86d03e7bc9
Merge: ae8d408b e9e761b0
Author: JackDUpModZ <83776161+JackDUpModZ@users.noreply.github.com>
Date:   Sun Jan 8 16:02:40 2023 +0000

    Merge pull request #816 from Zan1456/patch-3

    Create ui_hu.html

commit ae8d408b2f
Merge: 7f53c705 de666f1b
Author: JackDUpModZ <83776161+JackDUpModZ@users.noreply.github.com>
Date:   Sun Jan 8 16:01:08 2023 +0000

    Merge pull request #815 from Zan1456/patch-2

    Create questions_hu.js

commit 7f53c70502
Merge: 63c06c0b ba4820c0
Author: JackDUpModZ <83776161+JackDUpModZ@users.noreply.github.com>
Date:   Sun Jan 8 15:58:58 2023 +0000

    Merge pull request #814 from Zan1456/patch-1

    Update hu.lua

commit 63c06c0b96
Merge: 8c47f5fa 36d05607
Author: JackDUpModZ <83776161+JackDUpModZ@users.noreply.github.com>
Date:   Sun Jan 8 15:56:01 2023 +0000

    Merge pull request #812 from BeansFL/patch-4

    Update de.lua

commit 8c47f5fa56
Merge: 46fc5f43 81306d50
Author: JackDUpModZ <83776161+JackDUpModZ@users.noreply.github.com>
Date:   Sun Jan 8 15:51:11 2023 +0000

    Merge pull request #789 from Cartman117/patch-1

    fix(esx_mechanicjob): Translation & Spawn vehicle from garage

commit 46fc5f4326
Merge: ba08825e 842f221b
Author: JackDUpModZ <83776161+JackDUpModZ@users.noreply.github.com>
Date:   Sun Jan 8 15:49:02 2023 +0000

    Merge pull request #798 from Mojito-Fivem/patch-1

    Update readme.md

commit ba08825eef
Merge: a8c424f7 2a659184
Author: JackDUpModZ <83776161+JackDUpModZ@users.noreply.github.com>
Date:   Sun Jan 8 15:48:49 2023 +0000

    Merge pull request #793 from fivemland/vehicleshop-refactor

    refactor(esx_vehicleshop)

commit a8c424f738
Merge: 90c97779 1abd1fb5
Author: Benzo <102178921+Benzo00@users.noreply.github.com>
Date:   Sun Jan 8 10:56:03 2023 +0100

    Merge pull request #818 from Kuuzoo/patch-1

    Only show Default Inventory if Config enabled.

commit 90c97779cb
Merge: 53629668 77de399b
Author: Benzo <102178921+Benzo00@users.noreply.github.com>
Date:   Sun Jan 8 10:55:38 2023 +0100

    Merge pull request #808 from QB-Extended/main

    feat(es_extended): add message to event

commit 1abd1fb5b4
Author: Kuuzoo <81863846+Kuuzoo@users.noreply.github.com>
Date:   Fri Jan 6 23:01:10 2023 +0100

    Only show Default Inventory if Config enabled.

    On Itme Remove/Add the Default Inventory will now only show if enabled in the es_extended Config!

commit e9e761b065
Author: Zan <62830223+Zan1456@users.noreply.github.com>
Date:   Fri Jan 6 11:46:26 2023 +0100

    Create ui_hu.html

commit de666f1b92
Author: Zan <62830223+Zan1456@users.noreply.github.com>
Date:   Fri Jan 6 11:46:02 2023 +0100

    Create questions_hu.js

commit ba4820c0a2
Author: Zan <62830223+Zan1456@users.noreply.github.com>
Date:   Fri Jan 6 11:42:08 2023 +0100

    Update hu.lua

commit 3ce03968db
Author: Zinzin92 <kevin-descours@outlook.fr>
Date:   Thu Jan 5 12:16:02 2023 +0100

    Create fr.lua

commit 36d05607eb
Author: BeansFL <106496863+BeansFL@users.noreply.github.com>
Date:   Thu Jan 5 03:26:47 2023 +0100

    Update de.lua

commit c4cc9843d5
Author: BeansFL <106496863+BeansFL@users.noreply.github.com>
Date:   Thu Jan 5 03:09:31 2023 +0100

    Update de.lua

commit 56992cd8bc
Author: BeansFL <106496863+BeansFL@users.noreply.github.com>
Date:   Thu Jan 5 02:57:03 2023 +0100

    Update de.lua

commit 77de399b99
Author: Mycroft <kaseyfitton@hotmail.co.uk>
Date:   Wed Jan 4 19:58:43 2023 +0000

    fix: more race condition fixing

commit 3892aa9b8f
Author: Mycroft <kaseyfitton@hotmail.co.uk>
Date:   Wed Jan 4 18:59:30 2023 +0000

    fix: society race conditions

commit 43fe788a2b
Author: Mycroft <kaseyfitton@hotmail.co.uk>
Date:   Wed Jan 4 18:52:48 2023 +0000

    refactor(esx_society): allow registering society with exports

commit c732d79263
Author: Mycroft <kaseyfitton@hotmail.co.uk>
Date:   Wed Jan 4 18:50:34 2023 +0000

    tweak(esx_society): better readme

commit e9e4fa0205
Author: Mycroft <kaseyfitton@hotmail.co.uk>
Date:   Wed Jan 4 00:17:51 2023 +0000

    fix(es_extended): print formatting

commit 5b2509b2fa
Author: Mycroft <kaseyfitton@hotmail.co.uk>
Date:   Tue Jan 3 23:14:27 2023 +0000

    feat(es_extended): add message to event

commit ff5d728d29
Merge: 63215f7e e0f55fc5
Author: TheFantomas <117121911+TheFantomas@users.noreply.github.com>
Date:   Mon Jan 2 21:01:20 2023 +0100

    Merge branch 'develop' into main

commit 63215f7e2d
Author: TheFarFantomas <thefarfantomas@gmail.com>
Date:   Mon Jan 2 19:00:01 2023 +0100

    Edit date in esx_identity

commit 25441de8b3
Author: TheFarFantomas <thefarfantomas@gmail.com>
Date:   Mon Jan 2 18:57:43 2023 +0100

    New year licenses

commit 842f221b34
Author: Liam Dormon <66041893+Mojito-Fivem@users.noreply.github.com>
Date:   Mon Jan 2 17:06:59 2023 +0000

    Update readme.md

commit effd985898
Author: AL1ƎN <72218928+johnsoul777@users.noreply.github.com>
Date:   Fri Dec 30 15:56:21 2022 +0100

    Create es.js

commit 0bc5589679
Merge: 92b111cb 17f96a74
Author: AL1ƎN <72218928+johnsoul777@users.noreply.github.com>
Date:   Fri Dec 30 15:55:12 2022 +0100

    Merge branch 'esx-framework:main' into main

commit 25016e8b4d
Author: Csoki <feketetibi71@gmail.com>
Date:   Fri Dec 30 12:06:18 2022 +0100

    refactor(esx_society): main/server.lua

commit a759b4d74b
Author: Csoki <feketetibi71@gmail.com>
Date:   Fri Dec 30 12:06:00 2022 +0100

    fix(esx_society): invalid job bug

commit 93d8a11aaf
Author: Csoki <feketetibi71@gmail.com>
Date:   Fri Dec 30 11:28:11 2022 +0100

    feat(esx_policejob): add esx_proprty dependency

commit 88bbaa1282
Author: Csoki <feketetibi71@gmail.com>
Date:   Fri Dec 30 11:27:10 2022 +0100

    fix(esx_society): fix invalid job bug

commit d572f1acb0
Author: Csoki <feketetibi71@gmail.com>
Date:   Fri Dec 30 11:15:36 2022 +0100

    feat(esx_society): add missing locales

commit 2a659184d6
Author: Csoki <feketetibi71@gmail.com>
Date:   Fri Dec 30 10:41:57 2022 +0100

    refactor(esx_vehicleshop): main/client.lua

commit 6212076bd4
Author: Csoki <feketetibi71@gmail.com>
Date:   Fri Dec 30 10:24:19 2022 +0100

    fix(esx_vehicleshop): 'hu' locales

commit fbbd6eb66a
Author: Csoki <feketetibi71@gmail.com>
Date:   Fri Dec 30 10:01:51 2022 +0100

    refactor(esx_vehicleshop): server/main.lua

commit 43f44a052f
Author: Csoki <feketetibi71@gmail.com>
Date:   Fri Dec 30 09:43:27 2022 +0100

    refactor(esx_vehicleshop): GeneratePlate(), IsPlateTaken()

commit 81306d503b
Author: Cartman117 <121615906+Cartman117@users.noreply.github.com>
Date:   Thu Dec 29 14:02:01 2022 +0100

    fix(esx_mechanicjob): French translation

commit e6481e106e
Author: Cartman117 <121615906+Cartman117@users.noreply.github.com>
Date:   Thu Dec 29 13:42:48 2022 +0100

    fix(esx_mechanicjob): Spawn vehicule from garage

    If Config.EnableSocietyOwnedVehicles = true, spawning vehicule from garage wasn't possible because element.value = 'vehicle_list' but we want vehicule's informations (element2.value)

commit 92b111cbc0
Author: AL1ƎN <72218928+johnsoul777@users.noreply.github.com>
Date:   Wed Dec 28 12:44:39 2022 +0100

    Fix Translate Saving

    Fix Translate Saving

commit 53d2aa56ee
Author: Amir_Lynx <60301485+AmirLynx@users.noreply.github.com>
Date:   Sat Oct 29 17:26:49 2022 +0330

    change isControlePress to registerInput
This commit is contained in:
Benzo
2023-01-18 15:01:23 +01:00
parent 21535af049
commit 4267f1d915
249 changed files with 1626 additions and 6408 deletions
readme.md
+1 -1
View File
@@ -22,7 +22,7 @@ Interested in helping us? [Take a look at our patreon](https://www.patreon.com/e
 ESX-legacy - ESX framework for FiveM
 Copyright (C) 2015-2022 ESX-Framework
 Copyright (C) 2015-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.