Commit Graph

4619 Commits

Author SHA1 Message Date
JonarSonaer 9b6759fa39 Merge branch 'esx-framework:main' into main 2022-03-28 15:17:43 +02:00
Mycroft b1b31b4c2d Merge pull request #175 from iSentrie/patch-1
refactor(esx_lscustom/client/main.lua): fixed loop
2022-03-27 23:24:05 +01:00
iSentrie fa0b5892ce mistyped 2022-03-27 18:56:02 +03:00
iSentrie 4c4c53c0d2 prop fixes 2022-03-27 18:54:27 +03:00
Mycroft a132299ebe Update Discord Link 2022-03-27 15:00:12 +01:00
iSentrie 65213f2c16 Fixed loop 2022-03-27 14:33:43 +03:00
JonarSonaer 3eaa7d6742 Merge branch 'esx-framework:main' into main 2022-03-27 12:28:06 +02:00
Mycroft d9f17c4994 Weaponshop refactor 2022-03-26 20:11:13 +00:00
Mycroft 133caab3c3 Refactor: ESX Weaponshop 2022-03-26 19:43:32 +00:00
Mycroft 9b9ce38938 Refactor: ESX Whitelist 2022-03-26 18:58:59 +00:00
ZF 3f4bae10e2 Fixed inversed bool for setDuty 2022-03-26 14:19:43 -04:00
Mycroft 6ecf43379f Merge pull request #174 from FBFezz/main
Fixed esx_joblisting
2022-03-26 15:10:09 +00:00
Fezz 894668f7c9 Fixed Not Showing Jobs 2022-03-26 15:09:18 +00:00
Fezz 232b5da271 Update fxmanifest.lua 2022-03-26 15:08:55 +00:00
JonarSonaer 8cf8e9b9b0 Merge branch 'esx-framework:main' into main 2022-03-25 08:49:15 +01:00
Mycroft abb18fe4a9 Tweak: ESX Drugs - Optimisations 2022-03-24 20:50:12 +00:00
Mycroft 7329ac43bd Tweak: MechanicJob - Optimisations 2022-03-24 20:49:52 +00:00
Mycroft f947029eab Tweak: TaxiJob - Optimisations 2022-03-24 20:49:40 +00:00
Mycroft fde3a48d9a Tweak: Real Estate Agent Job - Optimisations 2022-03-24 20:36:59 +00:00
Mycroft b3a1211590 Tweak: ESX LScustom - Optimisations 2022-03-24 20:28:52 +00:00
Mycroft 20b6f534c6 Fix: ESX Jobs 2022-03-24 19:54:45 +00:00
Mycroft 5fe0a660bd Tweak: ESX Property - Optimisations 2022-03-24 19:03:00 +00:00
Mycroft c2029077ad Refactor: JobListing - Optimisations and security patches 2022-03-24 18:54:06 +00:00
Mycroft 64b973fbb5 Fix: AmbulanceJob - Missing Comma 2022-03-24 18:52:57 +00:00
RoadToSix 6ccd047cb6 Update fxmanifest.lua 2022-03-24 15:46:45 +01:00
ZF 54f006f0b4 Added Config for default duty 2022-03-24 06:29:44 -04:00
JonarSonaer 726838d5a3 Merge branch 'esx-framework:main' into main 2022-03-24 07:59:22 +01:00
Mycroft a3dc7a2560 Fix Formatting 2022-03-24 00:49:02 +00:00
Mycroft 56e7bd3bcf Fix: Hopefully Fix Ammo Bug 2022-03-24 00:45:20 +00:00
Mycroft 898cbc8573 Merge pull request #169 from FantomasIsBad/patch-1
Fix fxmanifest in esx_ambulancejob
2022-03-23 23:09:54 +00:00
Mycroft 22b4963240 Merge branch 'main' into patch-1 2022-03-23 23:09:30 +00:00
JonarSonaer cff532202c Merge branch 'esx-framework:main' into main 2022-03-23 18:10:16 +01:00
Mycroft 003a8efaf1 Remove Submodule 2022-03-23 16:25:16 +00:00
Mycroft 8e82543933 Version Bump for 1.6.5 2022-03-23 16:22:46 +00:00
Mycroft cacf7804f3 Merge pull request #170 from thelindat/multichar
Merge esx_multicharacter into esx-legacy
2022-03-23 16:19:16 +00:00
Linden 76fd1185bf Merge 'esx_multicharacter' into esx-legacy 2022-03-24 03:10:56 +11:00
Linden 1be411b3d1 chore: move esx_multicharacter files 2022-03-24 03:07:43 +11:00
Mycroft d2c1c6ecd9 Revert "Delete esx_multicharacter"
This reverts commit d659a73d18.
2022-03-23 16:04:42 +00:00
Mycroft b9232a2533 Revert "Feat: Add Official Multicharacter"
This reverts commit e6dd5a5f2c.
2022-03-23 16:04:38 +00:00
ZF 98c8b40114 Code Correction
- Changed onduty for onDuty (CamelCode)
- Event now uses bool instead of state arg.
- Unemployed is now off-duty (doesn't change the paycheck).
2022-03-23 09:14:22 -04:00
FantomasIsBad cfd232d89e Fix fxmanifest in esx_ambulancejob 2022-03-23 12:19:54 +01:00
Mycroft e6dd5a5f2c Feat: Add Official Multicharacter
Added ESX_Mulicharacter
bumped version to 1.6.5
Fixed es_extended/version.json
2022-03-22 22:08:02 +00:00
Mycroft d659a73d18 Delete esx_multicharacter 2022-03-22 21:35:15 +00:00
JonarSonaer b774203b74 Merge branch 'esx-framework:main' into main 2022-03-22 15:28:40 +01:00
Tinky ac7459d05a Protection, fixed giving weapons components, tints 2022-03-20 20:02:23 +01:00
ZF 8ab2aa8fa2 Revert "Config for spawn point (firstspawn/bug)"
This reverts commit 62db2291f8.
2022-03-18 19:53:16 -04:00
ZF 62db2291f8 Config for spawn point (firstspawn/bug) 2022-03-18 19:52:53 -04:00
ZF 028af92484 Fix: loadESXPlayer onduty. 2022-03-18 19:36:09 -04:00
ZF 42d4d6276b Fix default onduty state of unemployed. 2022-03-18 19:35:21 -04:00
ZF 694a423034 toggleDuty to setDuty
- Default duty have been put to be true.
- toggleDuty event have been changed to setDuty needing a boolean state.
2022-03-18 19:34:23 -04:00