Commit Graph

6958 Commits

Author SHA1 Message Date
Thekuca 9cf8ed13f4 chore(LICENSE): update copyright year 2024-03-07 16:38:46 +01:00
Thekuca c18067b3ee chore(LICENSE): update copyright year 2024-03-07 16:38:29 +01:00
Thekuca 7b8e4de955 chore(LICENSE): update copyright year 2024-03-07 16:38:11 +01:00
Thekuca 2dbc339aaf chore(LICENSE): update copyright year 2024-03-07 16:37:29 +01:00
Gellipapa 6fdcc1fda1 Merge pull request #1328 from esx-framework/fix-dev-to-main
🔀 Main to dev sync
2024-02-29 22:38:08 +01:00
Gellipapa 8e94cad87e Merge branch 'dev' into fix-dev-to-main 2024-02-29 22:37:15 +01:00
Gellipapa b887903c43 Merge pull request #1317 from esx-framework/1.10.5-fix-branch
🚑 1.10.5 merge to main
2024-02-18 00:00:34 +01:00
Manifest Bumper 731b6a13b8 chore: bump manifest version to 1.10.5 2024-02-17 22:53:26 +00:00
Gellipapa 89708d2dc8 Merge pull request #1314 from Arctos2win/main
hotfix(es_extended/client/main.lua):reinitiating backwards compatibil…
1.10.5
2024-02-17 23:42:52 +01:00
Gellipapa 0d4ee0cff2 Merge pull request #1312 from KeeganAI/main
fix(es_extended/config.lua): Fix Typo Errors
2024-02-17 17:16:01 +01:00
Arctos2win 9d3ce9b8dd refactor(es_extended/client/main.lua): move the event 2024-02-14 14:42:55 +01:00
Arctos2win f02c5958ef Merge pull request #1313 from Arctos2win/main
hotfix(es_extended/client/main.lua):reinitiating backwards compatibility with spawnmanager
2024-02-14 01:21:20 +01:00
Arctos2win d40ff2f70e hotfix(es_extended/client/main.lua):reinitiating backwards compatibility with spawnmanager 2024-02-14 01:17:44 +01:00
KeeganAI 6d50eb4fed fix(es_extended/config.lua): Fix Typo Errors
Corrected some spelling errors.
2024-02-13 20:08:09 +01:00
Arctos2win d3d628523e Merge pull request #1310 from Sub-Zero-Interactive/main
refactor: add better descriptions to the fxmanifests
2024-02-11 16:59:31 +01:00
Kasey FItton 77e880a715 refactor: add better descriptions to the fxmanifests 2024-02-11 15:04:21 +00:00
Gellipapa 81f3e64247 Merge pull request #1302 from RoyaleWind/main
Added Greek language to multicharacter
2024-02-03 00:04:06 +01:00
Thekuca 954f5e8452 main🔁dev - sync
sync
2024-01-31 15:20:16 +01:00
Gellipapa 7c59848a08 Merge pull request #1304 from esx-framework/1.10.4-hotfix
🔀 synch main to 1.10.4
2024-01-30 21:46:50 +01:00
Gellipapa f9e35dc9e3 Added newBranch feature options and added default excludeOptions in simple release github action 2024-01-30 21:43:38 +01:00
Thekuca 218af242d3 🔁 1.10.4 sync
1.10.4 hotfix sync
2024-01-30 21:23:22 +01:00
Manifest Bumper 82affe3e1e chore: bump manifest version to 1.10.4 2024-01-30 20:08:06 +00:00
Thekuca 3ecb303bbd fix(lint) 1.10.4 2024-01-30 14:55:54 +01:00
Thekuca 31505854bc fix(lint) 2024-01-30 14:55:21 +01:00
Arctos2win f35d6dc23a fix:(spawn to coords 😅) 2024-01-29 18:26:24 +01:00
Arctos2win 585a4e4c2e fix:(resurrect local player) 2024-01-29 18:25:10 +01:00
RoyaleWind e8b80f26f8 Added Greek language to multicharcter 2024-01-29 15:37:02 +02:00
Gellipapa 92db83718e Merge pull request #1300 from Arctos2win/dev
Hotfix health metadata not setting
2024-01-28 23:44:54 +01:00
Arctos2win 963f10ca5b remove comments ( debug ) 2024-01-28 21:03:04 +01:00
Arctos2win 366c78cc40 Hotfix health metadata not setting 2024-01-28 17:49:12 +01:00
Gellipapa e223119182 Merge pull request #1296 from Arctos2win/Arctos2win-VehicleProperties
Fix VehicleProperties function and remove credits
2024-01-27 19:09:47 +01:00
Gellipapa ecfe35caf8 Merge pull request #1299 from Arctos2win/Arctos2win-DoesJobExist
minimize DoesJobExist function
2024-01-27 16:35:49 +01:00
Gellipapa 7adb8e1d5a Merge pull request #1298 from Arctos2win/Arctos2win-Notify
Remove or statements that don't do stuff
2024-01-27 16:31:13 +01:00
Arctos2win 0b370c70e8 minimize doesjobexist function 2024-01-27 15:57:21 +01:00
Arctos2win 809b397017 Remove or statements that don't do stuff 2024-01-27 15:51:31 +01:00
Arctos2win cfd62c7a31 Fix VehicleProperties function and remove credits 2024-01-27 15:27:42 +01:00
Arctos2win 4eab57589f Merge pull request #1295 from esx-framework/main
sync main to dev
2024-01-27 14:49:21 +01:00
TheFantomas d41ac35f92 Merge pull request #1293 from Arctos2win/main
Fix for ox inventory
1.10.3
2024-01-25 16:47:56 +01:00
Arctos2win 3f13bd57a2 Put ox inventory back in the configuration 2024-01-25 16:34:44 +01:00
Arctos2win 2dac6a5328 Remove checking for start in ox inventory state 2024-01-25 16:24:57 +01:00
Gellipapa 8a91473ff7 📝 Update fxversion to 1.10.3 2024-01-25 00:34:22 +01:00
Gellipapa 922b6331c9 Merge pull request #1292 from esx-framework/dev
🎉 New release 1.10.3
2024-01-24 23:15:02 +01:00
Gellipapa 9d90c9d674 🎨 Run formatter 2024-01-24 23:07:30 +01:00
Gellipapa 1d7572fdc8 Merge pull request #1290 from Arctos2win/loadESXPlayer
REwrite LoadESXPlayer
2024-01-24 22:30:55 +01:00
Arctos2win a197ead1f6 Merge pull request #3 from Arctos2win/dev
fix player bugging in ground collision at spawn
2024-01-24 22:24:44 +01:00
Arctos2win 66379330c0 fix player bugging in ground collision at spawn 2024-01-24 22:22:07 +01:00
Arctos2win ae4473bd9b Merge pull request #2 from Arctos2win/dev
dev to loadESXPlayer
2024-01-24 21:24:40 +01:00
Arctos2win e7654914e3 don't save player when not spawned 2024-01-24 21:19:13 +01:00
Arctos2win 0b01cfd287 change handling of ox inventory config 2024-01-24 21:14:41 +01:00
Arctos2win 55ec231f29 Update main.lua 2024-01-22 23:26:04 +01:00