46d82cfff1
Merge branch 'main' into main
2022-10-10 22:23:10 +01:00
0f89512118
Merge pull request #455 from dolutattoo/main
...
fix(esx_property): fixed locales and SQL queries
2022-10-10 22:19:57 +01:00
af26e35d33
Merge branch 'main' into main
2022-10-10 22:19:50 +01:00
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
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
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
55832fa50b
add extra translations for other options
2022-10-09 22:03:17 +08:00
a5bd8ba924
Merge pull request #530 from FAr18/esx_property
...
feat(esx_property/locales): Traditional Chinese
2022-10-09 16:00:51 +02:00
9fdc5e0106
Merge pull request #554 from Taavi-AU/main
...
refactor(esx_society) - esx_context
2022-10-09 15:58:43 +02:00
6cbd6ef1cf
update
2022-10-09 21:52:38 +08:00
e81ec7570c
update
2022-10-09 21:52:22 +08:00
755bb0f8aa
refactor: change _U to TranslateCap
2022-10-09 01:09:20 +01:00
7d9e994846
Squashed commit of the following:
...
commit 4e52da5cf7c048b434c8f062b4feketetibi71@gmail.com >
Date: Wed Oct 5 16:35:53 2022 +0200
Merge branch 'main' into locale-convar
commit c048b434e5e9fb9882d16869b5feketetibi71@gmail.com >
Date: Sat Sep 17 15:06:21 2022 +0200
Merge branch 'main' into locale-convar
commit e9fb988237feketetibi71@gmail.com >
Date: Thu Sep 15 00:26:18 2022 +0200
add server.cfg esx:locale convar
commit dffaa5caaefeketetibi71@gmail.com >
Date: Thu Sep 15 00:24:55 2022 +0200
refactor translate function
commit f665fc2c7ffeketetibi71@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
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
6187a289a4
feat(esx_property): Optional Zone Based Pricing
2022-10-09 00:26:18 +01:00
6d2bf4cc6b
Merge pull request #545 from iSentrie/patch-2
...
fix(es_extended): setAccountMoney logic fix
2022-10-07 15:48:48 +02:00
0200c82467
logic fix
2022-10-06 19:17:25 +03:00
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
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
c55a5bb6c9
Update addonaccount.lua
2022-10-03 00:16:02 +02:00
6e9a8e57c6
feat: events for updating addon accounts balance
2022-10-03 00:15:40 +02:00
f860aec9b4
Update addonaccount.lua
2022-10-02 23:50:27 +02:00
052cecc025
Update addonaccount.lua
...
Trigger this serverside as well to help with syncing
2022-10-02 23:49:35 +02:00
5a92bba69d
fix(esx_weaponshop) - adding missing translations
2022-10-02 22:13:35 +02:00
8b6d169dcd
refactor(esx_weaponshop) - esx_context
...
replacing esx_menu_default for esx_context
2022-10-02 21:46:16 +02:00
68458c228c
feat:(es_extended/commands.lua) - giveammo command
2022-10-02 20:00:13 +02:00
2579864719
Merge pull request #517 from HariboInc/patch-5
...
refactor(esx_shops): Dutch translations
2022-10-02 19:10:02 +02:00
db29f18850
Merge pull request #518 from HariboInc/patch-6
...
refactor(esx_vehicleshop): Dutch translations
2022-10-02 19:09:49 +02:00
931d7d25d3
Merge pull request #521 from HariboInc/patch-10
...
refactor(esx_phone): Dutch translations
2022-10-02 19:09:00 +02:00
83c19b1f90
Merge pull request #523 from HariboInc/patch-13
...
refactor(esx_mechanicjob): Dutch SQL
2022-10-02 19:07:54 +02:00
1a22fe4576
Merge pull request #520 from HariboInc/patch-9
...
refactor(esx_rpchat): Dutch translations
2022-10-02 17:48:40 +02:00
9da6e9e9d4
Merge pull request #527 from HariboInc/patch-15
...
refactor(esx_joblisting): Dutch translations
2022-10-02 17:47:52 +02:00
43d24f95f5
Merge pull request #528 from HariboInc/patch-16
...
refactor(esx_holdup): Dutch translations
2022-10-02 17:47:42 +02:00
32e27f3876
Rename nl_esx_mecanojob.sql to nl_esx_mechanicjob.sql
2022-10-02 16:09:53 +02:00
12a34968dd
feat(esx_property/locales): Traditional Chinese
2022-10-02 20:02:20 +08:00
8856bf3b59
refactor(esx_holdup): Dutch translations
2022-10-02 12:00:53 +02:00
b818d38d52
refactor(esx_joblisting): Dutch translations
2022-10-02 11:58:58 +02:00
83f4852dc0
refactor(esx_mechanicjob): Dutch SQL
2022-10-02 00:44:27 +02:00
c4faa00aa8
refactor(esx_phone): Dutch translations
2022-10-02 00:33:06 +02:00
6b4eb0b88f
refactor(esx_rpchat): Dutch translations
2022-10-02 00:29:33 +02:00
e3f666ea69
refactor(esx_vehicleshop): Dutch translations
2022-10-02 00:02:56 +02:00
b282c9522f
refactor(esx_shops): Dutch Translations €
2022-10-01 23:45:32 +02:00
8c1d9f38e4
refactor(esx_shops): Dutch translations
2022-10-01 23:35:01 +02:00
ceefda18ee
Merge pull request #514 from HariboInc/main
...
refactor(esx_property): Dutch translations and typo fixed
2022-09-29 22:42:02 +02:00
0dbff29454
refactor(esx_property): Typo fixed
2022-09-29 22:38:13 +02:00
470a2b3f9d
refactor(esx_property): Dutch translations
2022-09-29 22:34:58 +02:00
a5b846525d
fix:(es_extended/config.lua) - typo
2022-09-29 13:51:19 +02:00
16088b7fcf
Merge pull request #509 from HariboInc/main
...
refactor(esx_basicneeds): Dutch Translations
2022-09-28 14:40:39 +01:00
d334382c6f
Merge pull request #510 from HariboInc/patch-1
...
refactor(esx_skin): Dutch translations
2022-09-28 14:40:27 +01:00
084f294860
Merge pull request #511 from HariboInc/patch-3
...
refactor(esx_billing): Dutch translations
2022-09-28 14:40:12 +01:00
Mycroft