Commit Graph

7507 Commits

Author SHA1 Message Date
Kenshin13 ab823974a8 Merge pull request #1566 from Kenshiin13/off-duty-pay
feat(es_extended/server/modules/paycheck): add offDuty pay
2025-01-01 16:44:04 +01:00
Kenshin13 de96c066ed fix(es_extended/server/modules/paycheck): stick to salary var 2025-01-01 16:42:11 +01:00
Kenshin13 670d0c4b7f feat(es_extended/server/modules/paycheck): add offDuty pay 2025-01-01 16:31:27 +01:00
Kenshin13 cb0c901b5b Merge pull request #1564 from Kenshiin13/add-missing-dlc-weapons
feat(es_extended/shared/config/weapons): add San Andreas Mercenaries dlc weapons
2024-12-31 23:41:14 +01:00
Kenshin13 8056d0f03c feat(es_extended/shared/config/weapons): add WEAPON_TECPISTOL
DLC: San Andreas Mercenaries
2024-12-31 23:29:23 +01:00
Kenshin13 94efb30942 Merge pull request #1563 from Kenshiin13/bottom-dollar-bounties-dlc-weapons
feat(es_extended/shared/config/weapons): add bottom dollar bounties dlc weapons
2024-12-31 23:06:22 +01:00
Kenshin13 88f9ac87bf feat(es_extended/shared/config/weapons): add bottom dollar bounties dlc weapons 2024-12-31 23:03:57 +01:00
Kenshin13 7d76cd5715 Merge pull request #1562 from Kenshiin13/chop-shop-dlc-weapons
feat(es_extended/shared/config/weapons): add chop shop dlcs weapons
2024-12-31 22:54:06 +01:00
Kenshin13 d79a3c1d1d feat(es_extended/shared/config/weapons): add chop shop dlcs weapons 2024-12-31 22:48:35 +01:00
Kenshin13 da0655fa70 Merge pull request #1561 from Kenshiin13/cleanup-esx-object
reafactor!(es_extended): Cleanup ESX object
2024-12-31 22:25:28 +01:00
Kenshin13 abe6b2d52e fix(esx_multicharacter): fix attempting to access nil table 2024-12-31 22:15:38 +01:00
Kenshin13 c88c9be1f4 refactor!(es_extended): move players into core 2024-12-31 21:37:14 +01:00
Kenshin13 dd6f0533ff refactor!(es_extended): move Items into core 2024-12-31 21:31:18 +01:00
Kenshin13 f6dcb82f27 refactor!(es_extended): move Jobs into core 2024-12-31 21:29:19 +01:00
Kenshin13 8608043bda refactor!(es_extended): move JobsPlayerCount into core 2024-12-31 21:23:56 +01:00
Kasey Fitton f53bbfe816 Merge pull request #1554 from feelfreetofee/dev
refactor(es_extended/client/imports/point.lua) and (es_extended/client/modules/points.lua): Performace Improvement
2024-12-29 00:16:45 +00:00
Kenshin13 d2b90ae978 Merge pull request #1560 from epyidev/dev
feat: add missing translations for french language
2024-12-25 11:38:33 +01:00
Epyi ef9d689873 feat: add missing translations for french language 2024-12-25 11:35:18 +01:00
Kenshin13 bb98a814f3 Merge pull request #1558 from Kenshiin13/fix-race-condition
fix(es_extended/): fix race conditions & ped change not propogating
2024-12-23 17:05:25 +01:00
Kenshin13 cb153c2fec fix(es_extended/client/modules/actions): avoid manually setting playerdata entirely 2024-12-23 16:52:23 +01:00
Kenshin13 553303fd28 fix(es_extended/client/modules/death): fix death module trying to access invalid ped 2024-12-23 16:39:48 +01:00
Kenshin13 831e4097f7 fix(es_extended/client/modules/actions): fix ped change not propogating 2024-12-23 16:37:15 +01:00
Kenshin13 3a3c3f1ed1 fix(es_extended/imports): wait for ped to be set before setting PlayerLoaded 2024-12-23 00:07:22 +01:00
Sergio f7faee7e23 refactor(es_extended/client/imports/point.lua) and (es_extended/client/modules/points.lua): Performace Improvement
Inside loop is now handled in the same resource as long more than one point is nearby.
2024-12-19 03:55:54 +01:00
Kenshin13 f7eb0ca4ff Merge pull request #1545 from Mycroft-Studios/rename-client-common-main
refactor(es_extended/client): rename common.lua and main.lua
2024-12-17 16:52:57 +01:00
Kenshin13 c26b5d7330 Merge pull request #1553 from Mycroft-Studios/better-vehicle-spawning
fix(es_extended/server/onesync): better vehicle spawning method
2024-12-16 23:00:46 +01:00
Kasey FItton c32d674886 Merge remote-tracking branch 'upstream/main' into better-vehicle-spawning 2024-12-16 21:46:40 +00:00
Kenshin13 617bfb648a Merge pull request #1552 from esx-framework/revert-1548-patch-3
Revert "fix(es_extended/server/functions): Core.IsPlayerAdmin returning false"
2024-12-16 22:45:53 +01:00
Kasey Fitton ddf43c0a6b Revert "fix(es_extended/server/functions): Core.IsPlayerAdmin returning false" 2024-12-16 21:45:04 +00:00
Kasey FItton 00eafee422 fix(es_extended/server/onesync): better vehicle spawning method 2024-12-16 21:43:26 +00:00
Kasey FItton 1f259824fa Merge branch 'dev' into better-vehicle-spawning 2024-12-16 21:42:17 +00:00
Arctos2win afdbee331a Merge pull request #1551 from Mycroft-Studios/debug-actions
feat(es_extended/client/actions):  add debug prints
2024-12-16 00:55:06 +01:00
Kasey FItton 023dfa509b feat(es_extended/client/actions): add debug prints 2024-12-15 23:53:43 +00:00
Arctos2win 5e5e4d315f Merge pull request #1550 from Mycroft-Studios/remove-server-actions
chore(es_extended/server): remove actions.lua
2024-12-16 00:37:48 +01:00
Kasey FItton 4c8f577d81 tweak(es_extended/fxmanifest): remove actions.lua 2024-12-15 23:32:13 +00:00
Kasey FItton ab19608dc2 chore(es_extended/server): remove actions.lua 2024-12-15 23:31:00 +00:00
Kasey Fitton d22c5b9cff Merge pull request #1548 from LivedBackwardss/patch-3
fix(es_extended/server/functions): Core.IsPlayerAdmin returning false
2024-12-15 23:14:41 +00:00
LivedBackwardss bc1fc8bcff fix(es_extended/server/functions): Core.IsPlayerAdmin returning false 2024-12-15 15:03:20 -08:00
Kasey FItton c00a9b6ab7 refactor(es_extended/client): move events.lua to modules 2024-12-15 22:50:31 +00:00
Kasey FItton f254c91128 refactor(es_extended/client): rename common.lua and main.lua 2024-12-15 22:48:53 +00:00
Kasey Fitton 032b6f623f Merge pull request #1544 from Mycroft-Studios/ox-inventory-detection
feat(es_extended/shared): add ox inventory detection back
2024-12-15 21:42:41 +00:00
Kasey FItton 11a26dc7af tweak(es_extended/shared/config/main): adjust comment 2024-12-15 21:40:33 +00:00
Kasey FItton 29fbab3d46 feat(es_extended/shared): add ox inventory detection back 2024-12-15 21:39:12 +00:00
Kenshin13 778cc0a81c Merge pull request #1540 from Zykem/await-func
feat(es_extended) Add ESX.Await function
2024-12-15 17:58:39 +01:00
Kenshin13 db68fceccc fix(es_extended/shared/functions): invokingResource not being displayed 2024-12-15 17:56:12 +01:00
Kenshin13 9336cfdc69 fix(es_extended/shared/functions): return result of conditionFunc & refactored code 2024-12-15 17:51:12 +01:00
zykem#0643 b6e82bd93d Addressing requested changes: pcall replace, errorMessage validation before loop, throwing actual error as formattedErrorMessage 2024-12-15 15:31:40 +01:00
zykem#0643 c32c41d718 Addressed PR feedback from Kenshiin13 2024-12-15 14:26:57 +01:00
Kenshin13 3f010ac967 Merge pull request #1542 from Zykem/actions-fix
fix(es_extended/client/modules/actions) EnterVehicle wrong variable name assign
2024-12-15 14:03:48 +01:00
zykem#0643 8568e628d5 Fix EnterVehicle wrong variable name assign 2024-12-15 11:39:19 +01:00