starred/esx_core-esx-framework
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-08-29 21:01:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,508 Commits 15 Branches 42 Tags
6ccfbf2b75eb178112dc40e7fbd6b079eb448fa7
Commit Graph

5508 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benzo 6ccfbf2b75 Merge pull request #566 from bitpredator/main 
fix:(Italian language correction)
 2022-10-17 02:55:24 +02:00
Benzo 6d4ccf9e2c Merge pull request #573 from iSentrie/patch-3 
refactor(esx_sit): removed same props
 2022-10-17 02:54:29 +02:00
Benzo 3f21dca967 Merge pull request #570 from feelfreetofee/patch-1 
fix(esx_clotheshop/client/main.lua) Invisible arms
 2022-10-17 02:54:10 +02:00
iSentrie eb376f2f78 dupes 2022-10-16 19:14:40 +03:00
Mycroft ff3b91f397 refactor(es_extended): make sure it always has a player 2022-10-15 15:58:38 +01:00
feelfreetofee fa06a91b20 fix(esx_clotheshop/client/main.lua) Invisible arms 
When arms are changed with arms_2 bigger than 0, arms becomes invisible until arms_2 is changed.
Added arms_2 to restricted menu
 2022-10-15 03:41:20 +02:00
Mycroft f435c8940e Merge pull request #569 from TheHolyFire/patch-2 
refactor(esx_mechanicjob/locales/en.lua) fixed a type
 2022-10-14 20:17:09 +01:00
HolyFire 0fef19e1b5 fixed a type 2022-10-14 21:12:02 +02:00
Mycroft 5c45d73ebc fix: dont wait for plate 2022-10-14 18:07:51 +01:00
Mycroft 94b1f1700f fix(esx_garage): working now 2022-10-14 18:01:02 +01:00
Mycroft 67c5c12049 fix(vehicleshop): wait until the vehicle is spawned 2022-10-14 17:58:42 +01:00
Mycroft fc87fe5c2d feat(esx_garage): Onesync Vehicle Spawning 2022-10-14 17:21:45 +01:00
Mycroft febb89bf58 fix(esx_vehicleshop): use new onesync function 2022-10-14 17:14:12 +01:00
Mycroft f181df5970 fix(esx_taxijob): use new onesync function 2022-10-14 17:11:42 +01:00
Mycroft 505fb6da6f !refactor(es_extended): Completely New Onesync spawing 
THIS REQUIRES ARTIFACT 5949 OR ABOVE ASWELL AS ONESYNC INFINITY
 2022-10-14 17:09:04 +01:00
bitpredator a8c0d83d60 fix:(Italian language correction) 
Italian language correction, with insertion of some missing strings in the it.lua translation
 2022-10-13 19:27:01 +02:00
Benzo 2d2d53da33 Merge pull request #553 from nemaDev/patch-3 
feat(esx_banking) - es translation
 2022-10-12 23:21:28 +02:00
Mycroft 3f40354355 feat(es_extended): Validation on Client-Side of the server-callback 2022-10-12 00:54:14 +01:00
Mycroft 524726862e Merge pull request #538 from Gittified/patch-1 
fix(esx_identity/html): Syntax error on registration
 2022-10-11 19:09:39 +01:00
Mycroft 46c1ac1440 Revert "Merge pull request #559 from lexinor/patch-1" 
This reverts commit 6b4d082024, reversing
changes made to 3580922707.
 2022-10-10 23:55:42 +01:00
Mycroft 98c5dfe4c2 Merge pull request #544 from iSentrie/patch-1 
fix(es_extended): ammo saving
 2022-10-10 22:23:35 +01:00
Mycroft 013070094b Merge pull request #537 from Gittified/main 
refactor(esx_holdup/client): improved thread sleeping
 2022-10-10 22:23:15 +01:00
Mycroft 46d82cfff1 Merge branch 'main' into main 2022-10-10 22:23:10 +01:00
Mycroft 0f89512118 Merge pull request #455 from dolutattoo/main 
fix(esx_property): fixed locales and SQL queries
 2022-10-10 22:19:57 +01:00
Mycroft af26e35d33 Merge branch 'main' into main 2022-10-10 22:19:50 +01:00
Mycroft 6b4d082024 Merge pull request #559 from lexinor/patch-1 
refactor(esx_society/client/main.lua): now using table.insert()
 2022-10-10 22:17:19 +01:00
Alessandro Alterno b0a8da51c6 refactor(esx_society/client/main.lua): now using table.insert() 
Small refactoring to remove these **elements[#elements+1]**
 2022-10-10 12:37:20 +02:00
Benzo 3580922707 Merge pull request #555 from Taavi-AU/main 
refactor(esx_society) -- new translation for new options
 2022-10-09 16:07:03 +02:00
Taavi 55832fa50b add extra translations for other options 2022-10-09 22:03:17 +08:00
Benzo a5bd8ba924 Merge pull request #530 from FAr18/esx_property 
feat(esx_property/locales): Traditional Chinese
 2022-10-09 16:00:51 +02:00
Benzo 9fdc5e0106 Merge pull request #554 from Taavi-AU/main 
refactor(esx_society) - esx_context
 2022-10-09 15:58:43 +02:00
Taavi 6cbd6ef1cf update 2022-10-09 21:52:38 +08:00
Taavi e81ec7570c update 2022-10-09 21:52:22 +08:00
Nema 90864515b8 Create es.lua 2022-10-09 01:15:27 -03:00
Mycroft 755bb0f8aa refactor: change _U to TranslateCap 2022-10-09 01:09:20 +01:00
Mycroft 7d9e994846 Squashed commit of the following: 
commit 4e52da5cf7
Merge: c048b434 c8f062b4
Author: Csoki <feketetibi71@gmail.com>
Date:   Wed Oct 5 16:35:53 2022 +0200

    Merge branch 'main' into locale-convar

commit c048b434e5
Merge: e9fb9882 d16869b5
Author: Csoki <feketetibi71@gmail.com>
Date:   Sat Sep 17 15:06:21 2022 +0200

    Merge branch 'main' into locale-convar

commit e9fb988237
Author: Csoki <feketetibi71@gmail.com>
Date:   Thu Sep 15 00:26:18 2022 +0200

    add server.cfg esx:locale convar

commit dffaa5caae
Author: Csoki <feketetibi71@gmail.com>
Date:   Thu Sep 15 00:24:55 2022 +0200

    refactor translate function

commit f665fc2c7f
Author: Csoki <feketetibi71@gmail.com>
Date:   Thu Sep 15 00:23:24 2022 +0200

    change all Config.locale to convar
 2022-10-09 01:00:40 +01:00
Mycroft a9457a7f55 feat(es_extended/locale.lua): Rename + default to English 
renames:
_ -> Translate
_U -> TranslateCap
yes, it keeps compatibility

default:
defaults to English if the translation is not there, so u can still use the script
 2022-10-09 00:51:26 +01:00
Mycroft 6187a289a4 feat(esx_property): Optional Zone Based Pricing 2022-10-09 00:26:18 +01:00
Benzo 6d2bf4cc6b Merge pull request #545 from iSentrie/patch-2 
fix(es_extended): setAccountMoney logic fix
 2022-10-07 15:48:48 +02:00
iSentrie 0200c82467 logic fix 2022-10-06 19:17:25 +03:00
iSentrie 1caf553046 ammo saving 
otherwise it doesn't update correctly and after relogging you lose ammo if it was reloaded at least once
 2022-10-05 10:29:19 +03:00
Nullified f832c127d2 fix(esx_identity/html): Syntax error on registration 
Removed unused onKeyDown tag from inputs in form.
 2022-10-03 16:40:17 +02:00
Nullified 58ad54eac4 refactor(esx_holdup/client): improved thread sleeping 
Moved the holdingUp toggle to the thread where the server event is triggered if the user is too far. Also improved thread sleeping so it turns on when the user is out of range and toggles once the robbery is canceled.
 2022-10-03 16:26:27 +02:00
Benzo c8f062b4ff Merge pull request #535 from antonstjernquist/patch-1 
feat: events for when updating esx_society accounts
 2022-10-03 11:55:46 +02:00
Anton Stjernquist c55a5bb6c9 Update addonaccount.lua 2022-10-03 00:16:02 +02:00
Anton Stjernquist 6e9a8e57c6 feat: events for updating addon accounts balance 2022-10-03 00:15:40 +02:00
Anton Stjernquist f860aec9b4 Update addonaccount.lua 2022-10-02 23:50:27 +02:00
Anton Stjernquist 052cecc025 Update addonaccount.lua 
Trigger this serverside as well to help with syncing
 2022-10-02 23:49:35 +02:00
Benzo 5a92bba69d fix(esx_weaponshop) - adding missing translations 2022-10-02 22:13:35 +02:00
Benzo 8b6d169dcd refactor(esx_weaponshop) - esx_context 
replacing esx_menu_default for esx_context
 2022-10-02 21:46:16 +02:00