Commit Graph

7545 Commits

Author SHA1 Message Date
Arctos2win bbcb3f2f26 Revert "Dev" 2025-01-06 15:41:38 +01:00
Arctos2win c8224cabe0 Merge pull request #1584 from esx-framework/dev
hotfix
2025-01-06 15:40:46 +01:00
Kenshin13 003b635920 Merge pull request #1581 from Kenshiin13/refactor-scaleforms
feat(es_extended/client/modules/scaleform): add scaleform util function and refactor existing scaleforms
2025-01-04 14:07:22 +01:00
Kasey Fitton b0bee10e12 Merge pull request #1580 from Mycroft-Studios/new-docs-link
chore: update docs link
2025-01-04 13:06:23 +00:00
Kenshin13 9470bfdfdd refactor(es_extended/client/modules/scaleform): shorter function name 2025-01-04 14:06:19 +01:00
Kenshin13 8844b57d17 refactor(es_extended/client/modules/scaleform): refactor ESX.Scaleform.ShowTrafficMovie 2025-01-04 13:48:47 +01:00
Kenshin13 ceb2fd446f refactor(es_extended/client/modules/scaleform): refactor ESX.Scaleform.ShowPopupWarning 2025-01-04 13:48:19 +01:00
Kenshin13 03de1afa41 refactor(es_extended/client/modules/scaleform): refactor ESX.Scaleform.ShowBreakingNews 2025-01-04 13:48:01 +01:00
Kenshin13 68dae93211 refactor(es_extended/client/modules/scaleform): refactor ESX.Scaleform.ShowFreemodeMessage 2025-01-04 13:47:36 +01:00
Kenshin13 1094efb80c feat(es_extended/client/modules/scaleform): add ESX.Scaleform.Utils.RunScaleformMovieMethod util function 2025-01-04 13:44:21 +01:00
Kasey Fitton a0dfa0ff01 Merge pull request #1579 from Mycroft-Studios/pr-template
feat(.github): PR template
2025-01-04 02:40:01 +00:00
Kasey FItton db535e1bbd feat(.github): PR template 2025-01-04 02:39:18 +00:00
Kasey FItton eb96467ce1 chore: update docs link 2025-01-04 02:28:40 +00:00
Kasey FItton 4cd09f1250 Merge branch 'dev' into new-docs-link 2025-01-04 02:26:49 +00:00
Kenshin13 db75d1128b Merge pull request #1576 from Kenshiin13/ox-lib-require
feat(es_extended/imports): use ox_lib require
2025-01-03 11:04:19 +01:00
Kenshin13 7b1e9b6e32 Merge branch 'dev' into ox-lib-require 2025-01-02 20:39:06 +01:00
Kenshin13 0fb7853d24 feat(es_extended/imports): use ox_lib require 2025-01-02 20:33:11 +01:00
Kenshin13 cd29078548 feat(es_extended/shared/modules/table): add ESX.Table.Wipe 2025-01-02 20:30:29 +01:00
Kenshin13 721f486940 Merge pull request #1575 from Kenshiin13/fix-import
fix(es_extended/imports): remove lua 5.4 dependency for importing resources
2025-01-02 19:45:17 +01:00
Kenshin13 a90b570aff fix(es_extended/server/functions): fix ESX.GetItems returning nil 2025-01-02 12:27:55 +01:00
Kenshin13 287582408a fix(es_extended/imports): remove lua 5.4 dependency for importing resources 2025-01-02 12:26:22 +01:00
Kasey Fitton 5bfe5ccfc6 Merge pull request #1574 from Mycroft-Studios/main
chore: version bump
1.12.2
2025-01-02 04:56:21 +00:00
Kasey Fitton c5acd5dcd0 Merge pull request #1573 from esx-framework/dev
1.12.2 Release
2025-01-02 04:55:15 +00:00
Kasey FItton 34203c199f chore: version bump 2025-01-02 04:54:22 +00:00
Kasey Fitton 7314bea972 Merge pull request #1572 from Mycroft-Studios/revert-changes
fix(es_extended): revert ESX.Items, ESX.Players and ESX.Jobs changes
2025-01-02 04:53:12 +00:00
Kasey FItton 28845050e9 Revert "refactor!(es_extended): move Jobs into core"
This reverts commit f6dcb82f27.
2025-01-02 04:49:03 +00:00
Kasey FItton 68af938e1c Revert "refactor!(es_extended): move Items into core"
This reverts commit dd6f0533ff.
2025-01-02 04:48:59 +00:00
Kasey FItton f21814fb5c Revert "refactor!(es_extended): move players into core"
This reverts commit c88c9be1f4.
2025-01-02 04:48:57 +00:00
Kasey Fitton c13c663cc3 Merge pull request #1571 from esx-framework/dev
feat(es_extended/server/functions) add ESX.GetItems
1.12.1
2025-01-02 01:07:42 +00:00
Kasey Fitton 0b883363df Merge pull request #1570 from Kenshiin13/esx-getitems
feat(es_extended/server/functions) add ESX.GetItems
2025-01-02 01:04:50 +00:00
Kenshin13 e407ec35f4 feat(es_extended/server/functions) add ESX.GetItems 2025-01-02 02:04:00 +01:00
Manifest Bumper d6fa11fc69 chore: bump manifest version to 1.12 2025-01-01 21:57:19 +00:00
Arctos2win 1895a910c1 Merge pull request #1568 from esx-framework/dev
ESX Legacy v1.12 🚀  dev -> main
1.12
2025-01-01 22:55:25 +01:00
Kenshin13 452877ce25 Merge pull request #1567 from Kenshiin13/require
feat(es_extended/imports): add require
2025-01-01 20:04:46 +01:00
Kenshin13 1ec3f8a02e refactor(es_extended/imports): remove debug print 2025-01-01 20:04:02 +01:00
Kenshin13 354b46a005 feat(es_extended/imports): avoid overwriting ox_lib require 2025-01-01 20:03:07 +01:00
Kenshin13 7b01753274 fix(es_extended/imports): fix typo 2025-01-01 19:54:07 +01:00
Kenshin13 71be624697 feat(es_extended/imports): add require 2025-01-01 19:35:15 +01:00
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