Commit Graph

7649 Commits

Author SHA1 Message Date
iSentrie 45efe07743 Merge branch 'dev' into patch-12 2025-03-10 00:02:55 +02:00
iSentrie 23915d1508 Update functions.lua 2025-03-09 23:42:54 +02:00
iSentrie eb1a2b9923 Update functions.lua 2025-03-09 23:39:57 +02:00
iSentrie 88a415a2b6 Update functions.lua 2025-03-09 23:29:52 +02:00
Kenshin13 764ca27729 Merge pull request #1619 from esx-framework/revert-1617-dev
Revert "feat(es_extended/server/modules/commands.lua): Add Validation Number"
2025-03-04 14:08:29 +01:00
Kenshin13 22d191b51e Revert "feat(es_extended/server/modules/commands.lua): Add Validation Number" 2025-03-04 14:06:50 +01:00
Fezz 5f340bae48 Merge pull request #1617 from YOMAN1792/dev
feat(es_extended/server/modules/commands.lua): Add Validation Number
2025-03-04 03:41:29 +00:00
YOMAN1792 80d934ac59 feat(player): refine inventory item count handling with rounding and maximum limit enforcement. 2025-03-03 21:33:05 -05:00
iSentrie 9083a71526 fix(functions.lua): IsPlayerAdmin group fix
Function failed to properly detect is player admin or not, while GetPlayerFromId function was receiving a string instead of number.
2025-03-02 11:49:04 +02:00
YOMAN1792 6693a7f503 feat(player): update inventory item addition to enforce maximum count limit 2025-02-25 22:59:31 -05:00
YOMAN1792 90ba45075e feat(player): enforce maximum amount limit for account money transactions 2025-02-25 22:01:15 -05:00
YOMAN1792 7877d9e40a feat(inventory): implement maximum amount cap for account money transactions 2025-02-25 21:58:23 -05:00
YOMAN1792 f2cde31251 feat(commands): remove maximum amount validation for account money and item commands 2025-02-25 21:55:24 -05:00
YOMAN1792 b60eb3b43c feat(commands): rename amount to count for giveitem and update ammo validation for giveweapon and giveammo 2025-02-25 17:05:23 -05:00
YOMAN1792 b4dbb5e0b7 Merge branch 'dev' of https://github.com/YOMAN1792/esx_core into dev 2025-02-25 16:49:14 -05:00
YOMAN1792 a0389d7e51 feat(commands): add max amount validation for giveitem, giveweapon, and giveammo 2025-02-25 16:47:44 -05:00
YOMAN1792 91e783c9e9 feat(commands): prevent money overflow from blocking further transactions 2025-02-25 16:47:05 -05:00
YOMAN1792 221e23b2b7 feat(commands): prevent Ox from breaking due to money overflow 2025-02-25 16:46:25 -05:00
YOMAN1792 5e91bad5c4 feat(commands): add maximum amount validation for giveitem, giveweapon, and giveammo commands 2025-02-25 15:47:32 -05:00
YOMAN1792 d9fe2d8051 Fix oc crash and the impossibility to give anymore money 2025-02-25 15:45:27 -05:00
YOMAN1792 3dae29d7dc Fix ox crash 2025-02-25 15:44:09 -05:00
Kenshin13 380e659f00 Merge pull request #1615 from t1ger-scripts/dev
feat(modules/createJob): triggerevent for created jobs
2025-02-18 22:37:12 +01:00
t1ger-scripts b66909c33d feat(modules/createJob): triggerevent for created jobs
Added a TriggerEvent when a job is created successfully, allowing developers to use an event listener and update ESX.Jobs, instead of importing the whole ESX object.
2025-02-18 22:28:02 +01:00
Kenshin13 abedb49da0 Merge pull request #1614 from t1ger-scripts/dev
fix(es_extended/server/functions): missing attributes for unemployed
2025-02-18 13:42:05 +01:00
t1ger-scripts 5ddd200802 fix(server/modules/createJob): skin nil check before json encode
Added checks for skin_male and skin_female before json encoding to prevent 'NULL' entries in database
2025-02-18 13:36:53 +01:00
t1ger-scripts 364dfc03c6 fix(server/modules/createJob): job grades not inserting
The queries assume that the parsed grades are numerically indexed. But removing ipairs method, and using pairs method, allows to loop grades that are indexed with strings as well. Just like we are using pairs method inside generatenewJobTable
2025-02-17 18:02:44 +01:00
t1ger-scripts 6d7831b0d0 fix(es_extended/server/functions): whitelisted attribute for unemployed
Added the missing whitelisted attribute for defaulted unemployed job.
2025-02-17 16:56:59 +01:00
t1ger-scripts 262ae32a8b fix: missing attributes for unemployed
Added missing attributes for unemployed job if no Jobs found
2025-02-17 16:35:01 +01:00
Kasey Fitton 45c259b020 Merge pull request #1610 from esx-framework/Mycroft-Studios-patch-1
tweak(es_extended/shared/main): remove deprication message
2025-02-07 13:57:16 +00:00
Kasey Fitton 901f16fb7b fix(es_extended/shared/main): remove unused variable 2025-02-07 13:52:31 +00:00
Kasey Fitton 6b4def278e tweak(es_extended/shared/main): remove deprication message 2025-02-07 11:51:51 +00:00
Kenshin13 0787a490ae Merge pull request #1608 from Kenshiin13/conn-string
fix(esx_multicharacter/server/modules/database): fix conn string parser
2025-02-03 18:49:15 +01:00
Kenshin13 34a5c00b5b fix(esx_multicharacter/server/modules/database): fix conn string parser 2025-02-03 17:03:24 +01:00
Kenshin13 c0b421f9bf Merge pull request #1605 from Kenshiin13/fix-logs
fix(es_extended/server/functions): fix admin logs
2025-01-25 14:29:13 +01:00
Kenshin13 db5128fcb6 fix(es_extended/server/functions): fix admin logs 2025-01-25 14:25:20 +01:00
Manifest Bumper 74e76ed613 chore: bump manifest version to 1.12.4 2025-01-23 21:29:23 +00:00
Kenshin13 16437408b4 Merge pull request #1603 from Kenshiin13/main
1.12.4 Hotfix
1.12.4
2025-01-23 22:21:16 +01:00
Kenshin13 2d86b4cb25 Merge branch 'main' of https://github.com/Kenshiin13/esx_core 2025-01-23 22:17:17 +01:00
Kenshin13 1b40b2cd60 Merge pull request #1592 from Kenshiin13/fix-death
fix(es_extended/client/modules/death): fix death thread on first spawn
2025-01-23 22:15:35 +01:00
Kenshin13 4c4dc4496b fix(es_extended/client/modules/death): fix death thread on first spawn 2025-01-23 22:15:35 +01:00
Kenshin13 2dac44381a Merge pull request #1601 from Kenshiin13/static-player
feat(es_extended): add static player methods
2025-01-23 12:32:54 +01:00
Kenshin13 66bf71c254 feat(es_extended/server/classes/player): add getter for playerId 2025-01-22 18:35:21 +01:00
Kenshin13 1ad52fa3e2 feat(es_extended/server/classes/player): add isAdmin getter 2025-01-22 18:33:11 +01:00
Kenshin13 7d9a64a524 feat(es_extended/server/classes/player): add getter for player source 2025-01-22 18:30:28 +01:00
Kenshin13 cd96d75ed9 refactor(es_extended/imports): fix styling 2025-01-22 18:28:10 +01:00
Kenshin13 54e0da8b33 refactor(es_extended/server/classes/player): add error msg for invalid functions 2025-01-22 18:24:45 +01:00
Kenshin13 4c9a7d2918 feat(es_extended/imports): add support for resolving player identifier 2025-01-22 18:24:20 +01:00
Kenshin13 df287b041b feat(es_extended): add static player methods 2025-01-22 16:12:21 +01:00
Kenshin13 153212ef11 Merge pull request #1599 from fnbar0/dev
refactor(es_extended/client/modules/scaleform): Make scaleforms show duration framerate independent
2025-01-19 16:49:36 +01:00
fnbar bdb74d05e9 Remove unnecessary calculations in loop 2025-01-19 16:39:55 +01:00