Commit Graph

7121 Commits

Author SHA1 Message Date
Kasey Fitton 0b658bc3bb tweak(code of conduct): remove sketchy russian links 2024-10-23 22:35:15 +01:00
Arctos2win 6728540076 Merge pull request #1423 from Arctos2win/dev
chore(readme.md): remove oxygenserv from readme
2024-10-19 23:57:58 +02:00
Arctos2win 27a92d165f chore(readme.md): remove oxygenserv from readme 2024-10-19 23:54:40 +02:00
Arctos2win 7b646e61d0 Merge pull request #1416 from Mycroft-Studios/main
tweak: use txAdmin locale by default
2024-10-19 20:04:04 +02:00
Kasey Fitton 661374f3f7 Merge pull request #1417 from feelfreetofee/patch-5
fix(es_extended/client/functions.lua): Fix typos
2024-10-19 10:12:21 +01:00
Arctos2win e142880bc3 Merge pull request #1422 from Mycroft-Studios/error-handling
tweak(es_extended): use correct correct handling
2024-10-18 22:00:19 +02:00
Kasey FItton a57759a115 tweak(es_extended): use correct correct handling 2024-10-18 16:31:08 +01:00
Kasey FItton 480d152f76 tweak(es_extended/config): condense Config.Locale 2024-10-18 07:58:52 +01:00
Sergio 8e170e07b2 fix(es_extended/client/functions.lua): on_release fix
I was wrong #1411
2024-10-16 00:42:51 +02:00
Gellipapa 5b68317f09 Merge pull request #1418 from esx-framework/main
🔄 Main to Dev
2024-10-15 17:57:37 +02:00
Sergio f1b519807b fix(es_extended/client/functions.lua): Fix typos
Small fixes
2024-10-15 17:53:59 +02:00
Kasey FItton d077156c88 tweak(es_extended/config): default to english 2024-10-15 15:40:58 +01:00
Kasey FItton 136c62bf77 twek(es_extended/config): account for txadminLocale being custom 2024-10-15 15:39:36 +01:00
Kasey FItton 782ea91995 Merge branch 'dev' 2024-10-15 14:54:00 +01:00
Kasey FItton 2ebaa422ea tweak: use txAdmin locale by default
by default, use the txAdmin locale, unless a `esx:locale` is specified.
This allows people to change languages easier, since everything will be in the same place, and if they want to specify a different language for ESX, then they can do.

This also wont break anything, since it wont affect existing users whom will aready have the `esx:locale` set
2024-10-15 14:52:37 +01:00
Gellipapa 2c14e5b633 Merge pull request #1415 from esx-framework/new-release-1.10.9
chore: bump manifest version to 1.10.9
2024-10-14 22:45:49 +02:00
Gellipapa 14a9c55ea3 Merge branch 'main' into new-release-1.10.9 2024-10-14 22:44:38 +02:00
Gellipapa 7763eab052 Merge pull request #1414 from esx-framework/dev
🚑 Fix release actions
1.10.9
2024-10-14 22:30:41 +02:00
Gellipapa f29b2fc910 Merge branch 'main' into dev 2024-10-14 22:29:45 +02:00
Gellipapa cdcff80fe6 Update simple-release.yml 2024-10-14 22:28:25 +02:00
Gellipapa e21fa00467 Update simple-release.yml 2024-10-14 22:27:40 +02:00
Manifest Bumper 424db9cf77 chore: bump manifest version to 1.10.9 2024-10-14 20:16:29 +00:00
Gellipapa 10d0701014 Merge pull request #1413 from esx-framework/dev
🚑 Release Hotfix 1.10.9
2024-10-14 22:06:16 +02:00
Gellipapa 1443d62286 Merge pull request #1411 from feelfreetofee/patch-4
fix(es_extended/client/functions.lua) RegisterInput and HashString bug
2024-10-13 18:36:36 +02:00
Gellipapa e044f64d1b Merge pull request #1410 from zImSkillz/main
Add an option to use the cancel function instead of the close function when closing a menu or all menus.
2024-10-13 17:08:59 +02:00
Sergio 622c8e5299 fix(es_extended/client/functions.lua) RegisterInput and HashString bug
In the last update, **RegisterInput** tries to execute the command on key release due some checks removal in #1303 . The check was restored and tested.

**HashString** breaks when the joaat returns a hash bigger than 2^31. It was fix using a [shift mask](https://stackoverflow.com/a/20294714).
2024-10-13 16:06:25 +02:00
zImSkillz c946633ba9 Add an option to use the cancel function instead of the close function 2024-10-12 19:42:02 +02:00
Gellipapa e7eb7f5172 Merge pull request #1409 from esx-framework/main
🔄 Sync Main to Dev
2024-10-10 19:15:27 +02:00
Gellipapa b07e2b92c4 Merge pull request #1408 from esx-framework/1.10.8-release
📦 chore: bump manifest version to 1.10.8
2024-10-10 18:34:03 +02:00
Gellipapa 7d4d901da0 Merge branch 'main' into 1.10.8-release 2024-10-10 18:33:27 +02:00
Manifest Bumper 1d0b275a7f chore: bump manifest version to 1.10.8 2024-10-10 16:29:56 +00:00
Gellipapa afffc1d39c Merge pull request #1398 from esx-framework/dev
📦 1.10.8 Release package
2024-10-10 18:11:28 +02:00
Gellipapa 39af19e543 Merge pull request #1407 from Sub-Zero-Interactive/main
!Refactor(core): Statebag removal and changes
1.10.8
2024-10-10 18:08:57 +02:00
Kasey Fitton 81daabe569 Merge pull request #1 from Arctos2win/patch-3
fix(esx_core): 🔨 send metadata to the client
2024-10-08 23:12:52 +01:00
Arctos2win 9bbe1f7f1c fix(esx_core): 🔨 send metadata to the client 2024-10-08 19:52:14 +02:00
Kasey FItton d61abc5096 !Refactor(core): Statebag removal and changes
Currently, everything flowing through xPlayer.set is being put into a statebag, aswell as all metadata , resulting in crashes.

This change is a high priority.
2024-10-08 02:24:24 +01:00
Gellipapa 9c13697bf1 Merge pull request #1406 from someone005/main
fix(notify): no valid icon
2024-10-01 18:51:08 +02:00
someone 809dc21de2 fix(notify): no valid icon 2024-10-01 18:30:07 +02:00
Gellipapa 88b8774b8f Merge pull request #1404 from Mesrine67/dev
Dev - Fix job creation with full transaction for `jobs` and `job_grades` tables
2024-09-27 10:23:39 +02:00
PaPi b16dabc177 Fix job creation with full transaction for jobs and job_grades tables
This patch improves the job creation process by using a complete SQL transaction to ensure that insertions into both the `jobs` and `job_grades` tables are atomic. The use of `INSERT IGNORE INTO jobs` has been corrected to avoid inconsistencies in retrieving the job ID, and all insertion steps are now part of a transaction to ensure that the job and its grades are created reliably.
2024-09-27 07:25:51 +02:00
Arctos2win e1cbd6ed2f Merge pull request #1403 from STACHY225/main
Typo fix
2024-09-23 18:43:17 +02:00
Babicz 587e33bd2f Typo fix 2024-09-23 17:52:17 +02:00
Arctos2win 3cb0bc8f45 Merge pull request #1400 from Arctos2win/dev
fix(client/modules/actions.lua): better solution
2024-09-16 23:16:24 +02:00
Arctos2win 2a05790d40 fix(client/modules/actions.lua): better solution 2024-09-16 21:07:19 +02:00
Gellipapa c3052cb58a Merge pull request #1399 from Arctos2win/dev
fix(client/modules/actions.lua): check if vehicle changed
2024-09-16 18:16:21 +02:00
Arctos2win 4d608de48f fix(client/modules/actions.lua): check if vehicle changed 2024-09-16 15:31:21 +02:00
Gellipapa 5fb49df387 Merge pull request #1303 from feelfreetofee/patch-3
refactor(es_extended/client/functions.lua) and (es_extended/client/modules/streaming.lua)
2024-09-15 15:27:18 +02:00
Gellipapa 921d99d659 Merge pull request #1397 from Gellipapa/main
📦 disabled police scanner sound
2024-09-15 15:15:24 +02:00
Gellipapa e0f2f2a9c2 Merge pull request #1396 from RrybaN/fix-awaiting-scripts
fix(ex_extended): prevent scripts from awaiting when multicharacter is false
2024-09-15 15:06:57 +02:00
Gellipapa 5fca64bb18 📦 disabled police scanner sound 2024-09-15 14:41:06 +02:00