Commit Graph

1160 Commits

Author SHA1 Message Date
Jellyton ec628fb6c7 Add OOC color to main config file 2022-12-28 02:42:00 +00:00
Jellyton 58ab2f6cbd Fix QBCore.Debug not printing correct invoking resource name 2022-12-28 02:39:18 +00:00
Jellyton b76160ca1e Fix proximity OOC spelling 2022-12-27 07:40:53 +00:00
Peter 33979cbede [FIX] more shared/vehicles.lua car names & brands (#901)
Co-authored-by: Zerio <54480523+Z3rio@users.noreply.github.com>
2022-12-22 23:22:05 +01:00
Peter 3ca665c76a [FIX] shared/vehicles.lua car names & other issues (#893)
Co-authored-by: Zerio <54480523+Z3rio@users.noreply.github.com>
2022-12-22 18:22:30 +01:00
Kakarot d3bfccc74c Merge pull request #897 from Z3rio/main
[SECURITY] Remove insecure event
2022-12-21 10:04:19 -06:00
Joel a96052ee26 Refactor: Removes indenting, reduces to one line (#899) 2022-12-21 16:42:45 +01:00
Zerio 8d5a0800ab Merge branch 'main' into main 2022-12-20 18:56:38 +01:00
KamuiKody c79a7b907a add baseevents back (#898) 2022-12-19 22:29:18 +01:00
Zerio 95de86d2e1 Merge branch 'qbcore-framework:main' into main 2022-12-17 01:18:57 +01:00
Zerio b057ef0395 Remove deprecated events 2022-12-17 01:18:16 +01:00
Zerio 091bcd2c3e Remove unnused & vulnerable event 2022-12-17 01:17:02 +01:00
R0adRa93 cc64ee38e8 Getting QB-Core ready for qb-jobs (#883)
Co-authored-by: Zerio <54480523+Z3rio@users.noreply.github.com>
2022-12-16 23:38:31 +01:00
David Malchin 1ef7337ce5 [BUG] Locale instances not actually being created (#860)
Co-authored-by: Zerio <54480523+Z3rio@users.noreply.github.com>
2022-12-14 17:55:17 +01:00
Pride1922 a3f2e3e8ca Update pt.lua (#891)
Up to date portuguese translation
2022-12-13 09:20:52 +01:00
Chris Sinclair 312f24d245 Bypass for loading QBCore in FxDK (#792)
FxDK does not include license identifiers by default and thus breaks scripts that utilize those. Without this you will get the "No valid Rockstar license" error when connecting. This fix was not my own I found it in the post linked below and tested myself.

https://forum.cfx.re/t/connection-rejected-by-server-fxdk/2504365/5

Co-authored-by: Kakarot <57848836+GhzGarage@users.noreply.github.com>
Co-authored-by: Stan <96954031+tom-osborne@users.noreply.github.com>
Co-authored-by: Zerio <54480523+Z3rio@users.noreply.github.com>
2022-12-11 13:43:10 +01:00
Zerio 40b56c724f Merge pull request #884 from KamuiKody/patch-2
Fix Misspelling
2022-12-10 03:44:35 +01:00
Zerio 01495b59cc Merge branch 'main' into patch-2 2022-12-10 03:42:07 +01:00
Zerio 048dac1d05 Merge pull request #828 from KamuiKody/main
Framework Optimization
2022-12-10 03:41:54 +01:00
KamuiKody e6ab7f2930 Merge branch 'qbcore-framework:main' into main 2022-12-09 21:32:37 -05:00
Zerio 0aadd63750 Merge pull request #885 from charj/patch-2
Bump version
2022-12-08 22:07:26 +01:00
Charlie 78fd87d126 Bump version 2022-11-19 11:49:24 +00:00
KamuiKody a62c17a67a Fix Misspelling 2022-11-19 06:42:02 -05:00
KamuiKody 72f036b608 vehicle mispelling 2022-11-19 06:39:50 -05:00
KamuiKody c51175a7a4 Merge branch 'qbcore-framework:main' into main 2022-11-10 16:07:15 -05:00
Stan cd3b057bcd Merge pull request #867 from Irishstevie/patch-1
Update vehicles.lua
2022-11-02 07:43:29 +00:00
Stevie d41d1a5f50 Update exports.lua 2022-11-02 07:16:07 +00:00
Stevie 5fd425fb1a Update vehicles.lua 2022-11-02 06:58:33 +00:00
KamuiKody 339d425ea7 Merge branch 'qbcore-framework:main' into main 2022-10-21 10:39:54 -04:00
KamuiKody daef1859b9 lint fail 2022-10-19 02:00:42 -04:00
KamuiKody b9576a6084 Replace breaks with Returns
currently when adding multiple jobs or items or gangs if there is a duplicate it breaks the loop instead of returning and going to the next item.
2022-10-19 01:46:04 -04:00
Stan d89662950b Merge pull request #862 from r0adra93/r0ad-veh
R0ad veh
2022-10-16 19:30:08 +01:00
R0adRa93 235e15abc4 Update vehicles.lua
replaced /t with /s/s/s/s
2022-10-16 10:49:06 -04:00
R0adRa93 93715043ea Update vehicles.lua
fixed linting issues
2022-10-16 10:44:31 -04:00
r0adra93 2caa8787d4 Update vehicles.lua
added commercial vehicles to the lua.
2022-10-14 23:14:58 -04:00
KamuiKody 5635ffbf04 Merge branch 'qbcore-framework:main' into main 2022-10-14 02:01:07 +00:00
R0adRa93 79d9ab99df Merge branch 'main' into r0ad-veh 2022-10-10 18:18:23 -04:00
Stan cee9d45448 Merge pull request #844 from D4isDAVID/fix/player-connecting
Add clearer messages and handle database errors on player connecting
2022-10-09 16:42:14 +01:00
David Malchin bd30889c1c Improve comments 2022-10-08 03:53:25 +03:00
David Malchin fd86efbe1b Raise server-side error on database timeout 2022-10-08 03:52:59 +03:00
r0adra93 6ef632ac6f Update vehicles.lua
Capitalized remaining values that weren't capitalized.
2022-10-06 02:57:39 -04:00
r0adra93 15b2e7136c added categoryLabel to shared/vehicles.lua
Added categoryLabel to shared/vehicles.lua table.
2022-10-06 02:18:22 -04:00
r0adra93 5e765b09e7 Merge remote-tracking branch 'upstream/main' into r0ad-veh 2022-10-06 01:51:37 -04:00
KamuiKody f1d0fbbf72 Merge branch 'qbcore-framework:main' into main 2022-10-01 16:51:14 +00:00
David Malchin 67ef3741b7 Add clearer messages and handle database errors on player connecting 2022-09-30 02:06:04 +03:00
Kakarot c528176c2b License acknowledgement
Respect to GiZz for using some of his code
2022-09-29 11:06:31 -05:00
KamuiKody 1412fb2754 Merge branch 'qbcore-framework:main' into main 2022-09-25 03:36:05 +00:00
Stan 343bc48d95 Merge pull request #824 from Mekz1222/patch-1
Added smg suppressor item
2022-09-23 17:30:21 +01:00
Stan 24ff22331d Merge branch 'main' into patch-1 2022-09-23 17:29:35 +01:00
Stan 4e18bd83f1 Merge pull request #845 from aboshaheen553/main
fix translation
2022-09-20 14:07:01 +01:00