Commit Graph

4657 Commits

Author SHA1 Message Date
StopherTv aa0749d51f Update weed.lua
Fix error when making transformation cannabis into marijuana if Config.LicenseEnable is enable (true). Error in client consol xCannabis is null and when exiting the zone transformation still running.
2022-04-26 17:44:22 +02:00
Mycroft 75522caf5f Merge pull request #222 from Benzo00/main
new ESX Notification
2022-04-26 16:40:53 +01:00
Mycroft 007dca711a Update index.html 2022-04-26 16:40:43 +01:00
Mycroft 4ec365974e Update script.js 2022-04-26 16:39:17 +01:00
Mycroft 8f0c6e8b25 Update fxmanifest.lua 2022-04-26 16:38:48 +01:00
Mycroft de2dd4a09b Update Notify.lua 2022-04-26 16:38:18 +01:00
Mycroft 8b22a8cde4 duplicate export 2022-04-26 16:37:56 +01:00
Benzo 9f20e73b4c Update config.lua 2022-04-26 17:36:21 +02:00
Benzo a643c70dcf fixes 2022-04-26 17:35:26 +02:00
Benzo fa43d3c59d Update functions.lua 2022-04-26 17:34:22 +02:00
Benzo 8aceb0493d notification function 2022-04-26 17:31:14 +02:00
Benzo de76329b4d new ESX Notification 2022-04-26 17:30:17 +02:00
Mycroft c9fb366efa tweak(legacy.sql): remove references to weaponshop 2022-04-25 19:23:28 +01:00
Mycroft 1ffc868100 Merge pull request #220 from douth-c/main
refractor(loadingscreen): updated client files for effect
2022-04-25 19:20:18 +01:00
Douth 44a95f1916 refractor(loadingscreen): "D" -> "d" 2022-04-25 13:15:12 -05:00
Douth 4c8cc681bc Merge branch 'esx-framework:main' into main 2022-04-25 13:05:37 -05:00
Douth 9866960b4b fix(fxmanifest): directory update 2022-04-25 13:05:24 -05:00
Douth f334aeabc4 feat: config file 2022-04-25 13:05:04 -05:00
Douth 0d79792399 feat(client): load effect 2022-04-25 13:04:50 -05:00
Mycroft 2875aeceee fix(esx_weaponshop/server): wrong variable 2022-04-25 19:00:20 +01:00
Mycroft 0ce0070bff fix(esx_weaponshop): fix typo 2022-04-25 18:52:21 +01:00
Mycroft f14c6013c5 fix (legacy.sql): remove unused weaponshop table 2022-04-25 18:52:00 +01:00
Mycroft 3b8071ea61 Merge pull request #218 from poppoexpress/main
Missing space
2022-04-25 18:36:41 +01:00
Mycroft b01c132133 Feat(esx/esx_loadscreen): New Loadingscreen 2022-04-25 18:18:57 +01:00
poppoexpress d72a09d3d4 Missing space 2022-04-25 09:36:28 +08:00
Mycroft 29379c038b Merge pull request #216 from tr1ckz/main
Feat(es_extended/client/functions.lua): Add RGB saving to vehicles
2022-04-23 14:12:41 +01:00
tr1ckz 905d8cdad0 Add RGB support and fixed liveries
Add RGB support and fixed liveries
2022-04-20 18:15:39 -04:00
Mycroft 2dacb08f0f Refactor! (esx_mechanicjob): Breaking - change functions to match legacy 2022-04-14 23:23:30 +01:00
Mycroft aa396444a4 fix(ambulancejob): stop abuse of dying 2022-04-14 23:22:55 +01:00
Mycroft 2cdcf797ba Merge pull request #209 from KarmaUnderground/main
Remove useless inesert in esx_optionalneeds
2022-04-14 19:58:43 +01:00
Mycroft 907bcb8212 Merge pull request #211 from iSentrie/patch-4
refactor(esx_jobs): Correct start order for functioning
2022-04-14 19:58:23 +01:00
iSentrie c7a89aab5a refactor 2022-04-14 19:10:32 +03:00
iSentrie 897e0ee469 fixes 2022-04-14 18:50:10 +03:00
iSentrie 89b8a5c854 Correct order for locales to work 2022-04-14 18:35:43 +03:00
manutrix d6cd2fa37f Remove an insert on a table that doesn't exist in esx_shops 2022-04-14 07:39:29 -04:00
Mycroft b0bb7e560c Fix(esx_jobs): make jobs work hopefully 2022-04-13 19:44:12 +01:00
manutrix f293ef770c Add shops table 2022-04-12 07:57:17 -04:00
Mycroft 95f3bba0e9 Revert "Merge pull request #206 from KarmaUnderground/main"
This reverts commit 9bce364e35, reversing
changes made to 223c8d540d.
2022-04-11 23:14:42 +01:00
Esplike e4f4473f67 feat(es_extended): Added "Duty" system
feat(es_extended): Added "Duty" system
2022-04-11 20:37:38 +01:00
LeZach 20b5f9a8f1 Merge branch 'main' into main 2022-04-11 15:27:45 -04:00
Esplike 99a9692529 Delete ui_es.html 2022-04-11 20:11:24 +01:00
Esplike 8c529f742d fix(esx_phone/html/ui_es.html): Moved HTML folder
Moved the ui_es.html into the html folder...
2022-04-11 20:11:14 +01:00
Esplike 3415b4c331 fix(esx_phone/html/ui.html): Default lang 'en'.
Nothing crazy but the default language for the phone will be in English...
2022-04-11 20:06:51 +01:00
Esplike 1cc4ab944f Update: [Locales] ES Translation for DMVSchool
Added question_es and ui_es and improved some spanish translation.
2022-04-11 19:19:34 +01:00
Esplike 9bce364e35 Merge pull request #206 from KarmaUnderground/main
Add esx_shops.sql. This table is being used in esx_optionalneeds but …
2022-04-11 19:14:46 +01:00
manutrix 664f1c41c4 Add esx_shops.sql. This table is being used in esx_optionalneeds but never created 2022-04-11 12:47:39 -04:00
TheDiego845 59179dfdbe Update es.lua 2022-04-09 21:01:29 +02:00
TheDiego845 f06193c99b Fixed some ES words 2022-04-09 21:00:00 +02:00
TheDiego845 c370d4851c HTML and Questions in Spanish for dmvscool 2022-04-09 20:55:50 +02:00
Esplike 223c8d540d SQL(esx_dmvschool) - Adds licenses
fix(esx_legacy): add missing esx_dmvschool sql
2022-04-09 12:16:49 +01:00