starred/esx_core
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-08-29 01:08:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,525 Commits 15 Branches 42 Tags
db535e1bbdcf4c3937983fb239d5f35a9bfebc87
Commit Graph

7525 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kasey FItton db535e1bbd feat(.github): PR template 2025-01-04 02:39:18 +00: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
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