starred/qb-core
1
0
Fork 0
mirror of https://github.com/qbcore-fivem/qb-core.git synced 2026-08-29 01:08:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,187 Commits 3 Branches 0 Tags
c1759f85cdadf0731e1ecc1f9d8c8b4d031c4f6a
Commit Graph

1187 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kakarot c1759f85cd Merge branch 'main' of https://github.com/qbcore-framework/qb-core 2023-04-27 17:34:54 -05:00
Kakarot 78bde5070a PR #963 2023-04-27 17:34:51 -05:00
Kakarot d10bebd3ec Merge pull request #966 from hakos47:patch-1 
GetGroundHash
 2023-04-27 15:27:39 -07:00
Kakarot 7a0ad63325 Merge pull request #967 from r3ps4J:main 
Fix subs not getting replaced in locales
 2023-04-27 15:25:59 -07:00
Kakarot a1b290413f Merge pull request #968 from mrdiamonddirt:feature/add-items-for-newsjob 
Feature/add items for newsjob
 2023-04-27 15:24:37 -07:00
Kakarot f76e359df2 Merge pull request #971 from erikmeyer08/patch-2 
Add pacycheck reason
 2023-04-27 15:21:27 -07:00
erikmeyer08 822b2e4187 Add pacycheck reason 
Adds the string 'paycheck' for AddMoney function 'reason' variable.
 2023-04-14 20:06:09 -04:00
RowDog cffc1712f3 remove all tabs replace with spaces 2023-04-02 13:59:08 +01:00
RowDog 0ee8ff7f38 sorted some spacing 2023-03-31 22:23:02 +01:00
RowDog 052c3fa6ff capitilize the description 2023-03-31 21:30:43 +01:00
RowDog 4675e97f5c add items to shared 2023-03-31 20:53:10 +01:00
r3ps4J 85d25bb911 Fix subs not getting replaced in locales 2023-03-30 12:01:26 +02:00
Zerio 4ba2262a27 Improve code readability 2023-03-25 14:19:51 +01:00
Hakos47 6738c06d55 Update functions.lua 2023-03-23 15:02:35 +01:00
Hakos47 50d73ed52b fix lint failed 
return material hash , entity hit, surfaceNormal, end coords, hit, and retval
 2023-03-23 12:44:34 +01:00
Hakos47 66c88b51e0 GetGroundHash 
returns the hash of the terrain you are on. quite useful for planting scripts
 2023-03-23 12:29:46 +01:00
Hakos47 15a264c3c9 GetGroundHash 
returns the hash of the terrain you are on. quite useful for planting scripts
 2023-03-23 12:24:30 +01:00
Index_1 b6249c3783 Update cn.lua (#959) 
Update language files
 2023-03-05 15:26:48 +01:00
Ilker Kulgu e17a6993dd EMS jobtype (#946) 
* EMS jobtype

* Bump

* Update fxmanifest.lua

---------

Co-authored-by: zwkf <dev@charlie.fyi>
 2023-03-03 18:01:56 +00:00
JaySixty 14625ec5b1 Move location of starter items (#865) 
* Update; Location of starter items

Moved the starter items to near top of the file - commonly searched for, and would be expected at top of the file

* Bump

---------

Co-authored-by: zwkf <dev@charlie.fyi>
 2023-02-24 02:49:41 +00:00
Christian J Bennett b5b3df1457 [SUGGESTION] JS guideline from 2 -> 4 spaces (#953) 
* Update JS Guide Line from 2 -> 4

* Update fxmanifest.lua

* Update fxmanifest.lua
 2023-02-23 21:48:05 +01:00
Brian eb0213c60b Update Norwegian language file (#934) 
* Updated no.lua

* Bump

---------

Co-authored-by: zwkf <dev@charlie.fyi>
 2023-02-22 00:02:26 +00:00
minkuan-buu e515317cc8 Fix Vietnamese translations (#947) 
* Update vn.lua

Edit spelling

* Bump

---------

Co-authored-by: zwkf <dev@charlie.fyi>
 2023-02-21 23:56:39 +00:00
KamuiKody 0a42541f34 remove unnecessary table (#936) 
at startup  there is no need to repopulate the same table it doesnt get called anywhere else in the entire resource folder.

Co-authored-by: zwkf <dev@charlie.fyi>
 2023-02-13 09:56:55 +00:00
R0adRa93 29d159cab1 Revert "Fix drawtext error (#938)" (#944) 
This reverts commit 14340bb374.
 2023-02-10 17:49:56 +00:00
worapol.pan.buraphan 14340bb374 Fix drawtext error (#938) 
1. Start QB-Core on a slow or low-spec computer
2. Access the Debug UI page (localhost:13172)
3. Encounter an error in the drawtext.js file
4. The issue stems from the script loading successfully but any resource call function (hideText) and sending an event message before index.html of all resources are fully loaded on NUI it make
`html
<div className="text" />` is not loaded.
 2023-01-31 23:59:36 +00:00
Jack 7b68f72cec Update vehicles.lua (#929) 
* Update vehicles.lua

Remove the space after this, as when somebody tries to pull it out, it will break PDM due to the space in the model hash.

* Bump version number

Co-authored-by: zwkf <dev@charlie.fyi>
 2023-01-26 01:58:28 +00:00
R0adRa93 01e8597f07 [FIX] Security match sql (#925) 
* Added PrepForSQL function

performs a check to a string with expected patterns to be matched.

* Bug Fixes

After talking with Stan I realized that it wasn't testing strings so I set it up to ensure data is a string.

I also reworded the event log.
 2023-01-18 18:53:38 +01:00
Charlie e6f5bf5ab6 Remove vehicle keys depdency from core (#920) 
Co-authored-by: Zerio <54480523+Z3rio@users.noreply.github.com>
 2023-01-18 17:17:15 +01:00
R0adRa93 9878aeaeb2 Added PrepForSQL function (#914) 
performs a check to a string with expected patterns to be matched.
 2023-01-17 16:01:36 +01: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