Commit Graph

1279 Commits

Author SHA1 Message Date
Kakarot 19d47dad14 PR #958 2023-04-27 17:42:58 -05:00
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
David Malchin d38e083f8f Merge branch 'main' into chore/vscode 2023-03-14 10:32:47 +02:00
zwkf ebce504d51 Merge branch 'main' into main 2023-03-07 00:07:38 +00:00
Ducko 90ac4bae8c Merge branch 'main' into main 2023-03-06 16:22:42 +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
tom-osborne 5feec5582b correct use of "or nil" 2023-03-02 07:28:25 +00:00
tom-osborne 7620c1c74a Add documentation (luadoc) to functions 2023-03-01 23:47:21 +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
zwkf 4612c3e7b9 Merge branch 'main' into main 2023-02-22 00:03:53 +00: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
David Malchin 7b1230bc2a Merge branch 'main' into chore/vscode 2023-02-14 15:12:49 +02:00
Zenith 7eeab56f7a Merge branch 'main' into main 2023-02-13 07:35:16 -08: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
Mythic 2311af93b4 sets veh as mission entity to use delete native 2023-02-01 09:33:57 -08: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
LRemp 889196adf0 bugfix: force clear vehicle custom colors before applying standart vehicle colors 2023-01-29 17:20:25 +02:00
Ducko 4c41374b35 Update da.lua 2023-01-28 08:49:41 +01:00
Ducko 6576fe84f8 Update da.lua 2023-01-28 07:59:45 +01:00
Ducko e3a3f7525e Update da.lua 2023-01-28 05:54:41 +01:00
Ducko b92a135704 Update da.lua 2023-01-28 05:31:12 +01:00
Ducko cc1fc1b0c9 Update da.lua 2023-01-28 05:30:14 +01:00
zwkf 23fe9046c3 Merge branch 'main' into patch-1 2023-01-26 02:03:29 +00:00
zwkf 68e64a7bec Merge branch 'main' into main 2023-01-26 02:02:28 +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
Worapol Buraphan d853f27a6d fix: lint 2023-01-22 00:03:49 +07:00
worapol.pan.buraphan 9312231c7d Merge branch 'main' into patch-1 2023-01-21 22:10:05 +07:00
Matti cf72c590ab Update nl.lua 2023-01-20 20:57:26 +01:00
Mallux 9d017073e1 Update fi.lua
Working Finnish translation
2023-01-20 14:20:04 +02:00
Peter 15be92922e Update ignus
Fixed ignus being classed as sports when its super
2023-01-19 21:05:53 +00:00