Commit Graph

3462 Commits

Author SHA1 Message Date
Linden 0bf778672b Merge remote-tracking branch 'esx_property/master' 2021-06-25 17:09:23 +10:00
Linden 18b6218a55 Merge remote-tracking branch 'esx_phone/master' 2021-06-25 17:08:57 +10:00
Linden 1ba63b4041 Merge remote-tracking branch 'esx_voice/master' 2021-06-25 17:08:32 +10:00
Linden 6015341168 Merge remote-tracking branch 'esx_sit/master' 2021-06-25 17:08:12 +10:00
Linden 562fca563a Merge remote-tracking branch 'esx_holdup/master' 2021-06-25 17:07:50 +10:00
Linden 95aa885300 Merge remote-tracking branch 'esx_mechanicjob/master' 2021-06-25 17:07:21 +10:00
Linden 088ecbdbc7 Merge remote-tracking branch 'esx_clotheshop/master' 2021-06-25 17:06:41 +10:00
Linden 1ba9aa745d Merge remote-tracking branch 'esx_ambulancejob/master' 2021-06-25 17:04:52 +10:00
Linden 6c65716787 Merge remote-tracking branch 'esx_taxijob/master' 2021-06-25 17:04:19 +10:00
Linden f493c4a58c Merge remote-tracking branch 'esx_drugs/master' 2021-06-25 17:03:33 +10:00
Linden d08b358dc7 Merge remote-tracking branch 'esx_barbershop/master' 2021-06-25 17:03:11 +10:00
Linden 05ce61aa46 Merge remote-tracking branch 'esx_whitelist/master' 2021-06-25 17:02:34 +10:00
Linden 47b2ef3554 Merge remote-tracking branch 'esx_dmvschool/master' 2021-06-25 17:01:56 +10:00
Linden 640e6bd17c Merge remote-tracking branch 'esx_menu_dialog/master' 2021-06-25 17:01:22 +10:00
Linden 18a5cbb347 Merge remote-tracking branch 'esx_jobs/master' 2021-06-25 17:00:58 +10:00
Linden 0c91ad9070 Merge remote-tracking branch 'esx_shops/master' 2021-06-25 16:58:51 +10:00
Linden 26fd50eb85 Merge remote-tracking branch 'esx_policejob/master' 2021-06-25 16:58:28 +10:00
Linden cc8983053d Merge remote-tracking branch 'esx_rpchat/master' 2021-06-25 16:57:49 +10:00
Linden 2e7bed219a Merge remote-tracking branch 'esx_billing/master' 2021-06-25 16:57:04 +10:00
Linden 0c246378a3 Merge remote-tracking branch 'esx_vehicleshop/master' 2021-06-25 16:56:33 +10:00
Linden 43f6fda1b8 Merge remote-tracking branch 'esx_society/master' 2021-06-25 16:55:53 +10:00
Linden 657a4ac65f Merge remote-tracking branch 'esx_datastore/master' 2021-06-25 16:55:07 +10:00
Linden 7f6b0c861d Merge remote-tracking branch 'instance/master' 2021-06-25 16:54:30 +10:00
Linden 61a00f99fa Merge remote-tracking branch 'esx_lscustom/master' 2021-06-25 13:06:58 +10:00
Linden 988c06adf5 Merge remote-tracking branch 'esx_identity/master' 2021-06-25 13:05:40 +10:00
Linden 9774e77401 Merge remote-tracking branch 'esx_cruisecontrol/master' 2021-06-25 13:01:39 +10:00
Linden 08ef9e81ab Merge remote-tracking branch 'esx_bankerjob/master' 2021-06-25 13:00:06 +10:00
Linden 6321b5e293 Merge remote-tracking branch 'skinchanger/master' 2021-06-25 12:56:33 +10:00
Linden 21cd5d3b51 Merge remote-tracking branch 'esx_menu_list/master' 2021-06-25 12:49:04 +10:00
Linden e9651f85d7 Merge remote-tracking branch 'esx_menu_default/master 2021-06-25 12:47:08 +10:00
Linden 30fd066fcb Merge remote-tracking branch 'es_extended/legacy' 2021-06-25 12:43:38 +10:00
Linden 7ac38e3526 Merge remote-tracking branch 'esx_optionalneeds/master' 2021-06-25 12:43:12 +10:00
Linden 0e8bb0a15d Merge remote-tracking branch 'esx_skin/master' 2021-06-25 06:25:43 +10:00
Linden 6745021e30 Merge remote-tracking branch 'async/master' into main 2021-06-25 06:08:26 +10:00
Linden 5dad65298c Merge branch 'main' into async/master 2021-06-25 06:08:20 +10:00
Linden c44fdf0e64 Merge remote-tracking branch 'esx_basicneeds/master' 2021-06-25 06:04:07 +10:00
Linden 27781811b2 Merge remote-tracking branch 'esx_status/master' 2021-06-25 06:03:56 +10:00
Linden bd21330485 Merge remote-tracking branch 'esx_accessories/master' 2021-06-25 06:01:32 +10:00
Linden 28d4ed59d0 Merge remote-tracking branch 'cron/master' 2021-06-25 05:54:23 +10:00
Linden 2c1eb8ceb9 Async 2021-06-25 05:54:19 +10:00
Linden 5878f71a0e Revert "Setup repository"
This reverts commit b656ed6a43.
2021-06-25 05:34:42 +10:00
Linden b656ed6a43 Setup repository 2021-06-25 04:00:05 +10:00
Linden 53ce92ec1d Merge branch 'esx-framework:legacy' into legacy 2021-06-24 21:36:11 +10:00
Linden 6202a9083c chore(server/main): Removed unused code 2021-06-24 21:35:55 +10:00
ESXCrackhead eabbdbb64e Merge pull request #1189 from thelindat/legacy
fix(client/functions): Spawn networked and local entities correctly
2021-06-23 21:31:13 -05:00
Linden 2c7215f5b9 Update version.json 2021-06-24 10:57:47 +10:00
Linden 29dc11b91a fix(client/main): Respect the networked value if sent for SpawnObject/SpawnVehicle 2021-06-24 10:51:42 +10:00
Linden a24d57d167 Revert "fix(client/functions): Properly network SpawnVehicle/SpawnObject entities"
This reverts commit c3acd5fd2a.
2021-06-24 10:49:39 +10:00
ESXCrackhead 6b8c1c1ef9 Merge pull request #1188 from thelindat/patch-1
fix(server/main): Define default values for loadout and weight
2021-06-23 09:45:43 -05:00
Linden 2980fd2160 fix(server/functions): Corrected a typo in the savePlayers query 2021-06-24 00:39:51 +10:00