Commit Graph

868 Commits

Author SHA1 Message Date
Kakarot fd3591e3ee Merge branch 'main' into patch-1 2022-06-15 17:46:14 -07:00
Kakarot 9c2a0a9905 Merge pull request #666 from JackBro2022/patch-2
Additional fixes to 4K scaling
2022-06-15 17:44:30 -07:00
Kakarot cb45b7be74 Merge pull request #663 from JackBro2022/patch-1
Better support for 4k screens
2022-06-15 17:43:59 -07:00
Kakarot 00ed5251f1 Merge branch 'main' into patch-1 2022-06-15 17:43:04 -07:00
Kakarot d855d5ab29 Merge branch 'main' into patch-2 2022-06-15 17:42:57 -07:00
Kakarot 9f0c613b37 Merge pull request #689 from Okkie-NL/patch-1
Updated nl.lua to add missing lines
2022-06-15 17:35:28 -07:00
Kakarot db91e67d3b Merge pull request #697 from serhatalmez/main
Added UpdateItem function.
2022-06-15 17:34:47 -07:00
Kakarot 25b653c295 Merge branch 'main' into patch-1 2022-06-15 17:32:59 -07:00
Kakarot 9d3506f5d0 Merge branch 'main' into main 2022-06-15 17:32:51 -07:00
Kakarot 337c91d081 Merge pull request #715 from Lionh34rt/patch-2
ExploitBan export
2022-06-15 17:31:37 -07:00
Kakarot 794020274e Merge branch 'main' into patch-2 2022-06-15 17:29:51 -07:00
Kakarot 9107130831 Merge pull request #721 from nzkfc/patch-2
Forces cars to spawn clean
2022-06-15 17:28:03 -07:00
Kakarot 0473af00d1 Merge pull request #723 from LuquinhasVulgoRC/main
Create pt-br.lua
2022-06-15 17:27:50 -07:00
Kakarot e8dd5941f4 Prevent error 2022-06-15 15:03:06 -07:00
RC 480e3030bc Create pt-br.lua 2022-06-13 19:02:59 -03:00
nzkfc a48e11de86 Forces cars to spawn clean
Will ensure cars spawn cleaned instead of random levels of dirt.
2022-06-10 22:10:44 +12:00
Lionh34rt 8062549f1b fix(server): linting issues 2022-06-08 17:26:49 +02:00
Lionh34rt 7c181b7cc8 Merge branch 'main' into patch-2 2022-06-08 17:19:52 +02:00
Kakarot c1bc866c45 Merge pull request #685 from buddizer/patch-1
Added missing es.lua phrases and improved others
2022-06-05 20:37:42 -05:00
Kakarot cb836b2727 Merge pull request #712 from Getpwnedbydolbajoba/patch-2
Create et.lua
2022-06-05 20:37:06 -05:00
Lionh34rt bc95a864b9 ExploitBan export
This export allows you to use it any script for exploit checks. Instead of having to define the function in multiple scripts like:

exports['qb-core']:ExploitBan(source, "pawn-shop")

https://github.com/qbcore-framework/qb-pawnshop/commit/8e81307cbabc3607fe4a82f88abf13765b35cf2f
2022-06-06 03:34:48 +02:00
Dolbajoba d3c8893922 Create et.lua 2022-06-02 16:20:17 +03:00
Kakarot 5a4d9877f7 Merge pull request #703 from TOSHKO003/main
Create bg.lua
2022-05-31 07:17:27 -05:00
Kakarot 62a2c3c3bd Merge branch 'main' into main 2022-05-31 07:16:31 -05:00
Kakarot b4ada8f054 Merge pull request #705 from IndexH/patch-1
Updated Chinese translation cn.lua
2022-05-31 07:16:09 -05:00
Index_1 7d6081c09c Merge branch 'main' into patch-1 2022-05-31 18:55:03 +08:00
buddizer 49cdf57f68 Merge branch 'main' into patch-1 2022-05-26 21:58:48 -06:00
Kakarot 269efefd17 Update README.md 2022-05-26 18:15:16 -05:00
FiveM-Hongge 4dd082f551 Updated Chinese translation cn.lua
Updated Chinese translation
2022-05-23 00:35:51 +08:00
buddizer c7aa5c9eba Merge branch 'main' into patch-1 2022-05-20 10:02:30 -06:00
Kakarot 25e561f52b Merge pull request #704 from BerkieBb/patch-2
fix(server/events): QBCore:HasItem callback
2022-05-19 10:19:34 -05:00
BerkieBb af3a564abd fix(server/events): QBCore:HasItem callback
Fixed the wrong return value of the check when a table is passed and added back the string indexed table amount check
2022-05-19 17:13:37 +02:00
TOSHKO003 2b297c192c Create bg.lua 2022-05-19 13:00:57 +03:00
Kakarot fbdf566649 MySQL Updates 2022-05-19 00:52:22 -05:00
Idris Dev 7032c471af feat: add reason to player dropped log.
Merging #700
2022-05-19 09:54:47 +10:00
Idris Dev eeafbd0405 fix: removed extra space in concatentation. 2022-05-19 09:53:16 +10:00
Tom Osborne 99d78988dc Merge branch 'main' into patch-1 2022-05-18 19:44:56 +01:00
Kakarot 490829f6d8 Update README.md 2022-05-18 12:47:26 -05:00
Kakarot 9bbf961613 Update README.md 2022-05-18 12:43:16 -05:00
Kakarot 2467d4d96f Merge pull request #693 from iLLeniumStudios/lint-support
Lint support
2022-05-18 08:46:20 -05:00
iLLeniumStudios 69399db42a Merge branch 'main' into lint-support 2022-05-13 08:17:58 +02:00
TheiLLeniumStudios e484ea0d48 Improve logic for HasItem 2022-05-13 06:16:21 +00:00
Tom Osborne 34c1988a9b Added 'reason' to playerDropped log
Added the reason given by the playerDropped event to the qb-logs discord embed message. Formatted on next line.
2022-05-12 19:18:31 +01:00
Idris Dev c94a706e12 Merge branch 'main' into patch-1 2022-05-12 20:07:44 +10:00
buddizer c1598bbbe8 Merge branch 'main' into patch-1 2022-05-11 17:53:58 -06:00
Kakarot c6e0659cdf Merge pull request #698 from Kingsage311/main
add CODE_OF_CONDUCT.md
2022-05-11 17:44:30 -05:00
Kings feaf202c1e add CODE_OF_CONDUCT.md
Just a CODE_OF_CONDUCT.md follow it don't break it.
2022-05-11 15:43:10 -07:00
almez bdd95c074f Update exports.lua 2022-05-10 21:00:17 +03:00
TheiLLeniumStudios 193e988875 Bump version 2022-05-07 17:35:17 +00:00
TheiLLeniumStudios 4994ce97bb Bump linter version 2022-05-07 15:38:39 +00:00