Commit Graph

276 Commits

Author SHA1 Message Date
BerkieBb b650e9dacc Merge branch 'main' into main 2022-07-09 17:40:10 +02:00
BerkieBb e90962fb4e Merge branch 'main' into main 2022-06-30 21:57:13 +02:00
BerkieBb c26879a702 fix(server/functions): hasitem single item check 2022-06-30 21:51:33 +02:00
Niunisas 52cb62c3b2 Fix HasItem check if amount is provided and item not found (#741)
* fix(server/events): amount checking fix

* fix(client/functions): item checking fix
2022-06-30 20:20:45 +02:00
BerkieBb 87d3636c12 feat(server/commands): multiple permission support and fix argsrequired 2022-06-27 18:10:00 +02:00
Kakarot 82ac1bec32 Revert phone number changes 2022-06-24 17:11:15 -05:00
BerkieBb 0b2f3c2a4e fix(server/functions): object amount parameter 2022-06-23 21:40:59 +02:00
TheHorizon-Fivem cd20d2b791 phone issue
a fix for the phone issue
https://github.com/qbcore-framework/qb-phone/issues/306 fixed by https://github.com/peppinoita but he didnt make a pull request for it
2022-06-20 19:48:18 +02:00
Kakarot 46f4ea625c Merge branch 'main' into main 2022-06-16 22:58:25 -07:00
Kakarot bb555091ca Update payment when changed in shared 2022-06-17 00:19:17 -05:00
BerkieBb cc0cf6a942 feat(server/functions): server side hasitem check 2022-06-17 01:10:16 +02:00
Kakarot 7f5fcc48ec Merge branch 'main' into patch-1 2022-06-16 11:41:07 -07:00
Kakarot 3f04db2df0 Update events.lua 2022-06-16 11:45:32 -05:00
MaximusR9 b726a0cb0c Update exports.lua 2022-06-16 18:43:07 +05:00
MaximusR9 3f838431b5 Merge branch 'main' into patch-1 2022-06-16 05:09:15 -07:00
Kakarot 03d24a3dcb Merge branch 'main' into ClientCallbacks 2022-06-15 20:06:51 -07:00
ItsANoBrainer 7daf9f121a Merge branch 'main' into ClientCallbacks 2022-06-15 21:56:46 -04:00
Kakarot 1be8447c2b Merge branch 'main' into main 2022-06-15 18:14:30 -07:00
Kakarot e4db9203a5 Merge branch 'main' into patch-1 2022-06-15 18:10:16 -07:00
Kakarot 1b795179b7 Merge branch 'main' into patch-1 2022-06-15 18:07:59 -07:00
Kakarot 53190a87ab Merge branch 'main' into main 2022-06-15 18:00:39 -07:00
Kakarot b43f9cecc9 Merge branch 'main' into patch-1 2022-06-15 17:51:02 -07:00
Kakarot 8cb6c676a6 Merge pull request #718 from uShifty/patch-4
fix: Phone number generation
2022-06-15 17:48:43 -07:00
Kakarot fd3591e3ee Merge branch 'main' into patch-1 2022-06-15 17:46:14 -07:00
Kakarot 7794794f3a Merge branch 'main' into main 2022-06-15 17:40:12 -07:00
Kakarot 9d3506f5d0 Merge branch 'main' into main 2022-06-15 17:32:51 -07:00
Kakarot 794020274e Merge branch 'main' into patch-2 2022-06-15 17:29:51 -07:00
Kakarot 3808b8dc0d Merge branch 'main' into patch-1 2022-06-15 17:29:47 -07:00
Kakarot 92eab1feb3 Merge branch 'main' into patch-4 2022-06-15 17:29:18 -07:00
mmoftah97 7c57f6a817 Address PR Comments. 2022-06-15 19:08:46 -04:00
mmoftah97 acb313c34d FEAT: Allow getting offline Player object 2022-06-15 19:08:46 -04:00
Kakarot e8dd5941f4 Prevent error 2022-06-15 15:03:06 -07:00
Lionh34rt 8062549f1b fix(server): linting issues 2022-06-08 17:26:49 +02:00
uShifty 88d31270bf fix: Phone number generation
Due to merging the 2 sets of random generated numbers it makes the variable PhoneNumber a string when it should be a number value. I noticed this bug when the framework function QBCore.Functions.GetPlayerByPhone was not working as intended.
2022-06-06 20:05:24 -07:00
QBLes 3c7f28f0b4 Updated to Events.lua
To allow backwards compatibility, this update Broke many scripts.
2022-06-06 17:49:25 +10: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
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
Kakarot fbdf566649 MySQL Updates 2022-05-19 00:52:22 -05: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
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
almez bdd95c074f Update exports.lua 2022-05-10 21:00:17 +03:00
TheiLLeniumStudios c2807c8b37 Clean up logic for HasItem to fix the linting warning 2022-05-06 15:42:27 +00:00
TheiLLeniumStudios fe9dae0543 Change back to compound operators 2022-05-06 13:56:21 +00:00
ItsANoBrainer 46ba99291c [Feature] Client Callbacks
Creates support for utilization of Client Callbacks.
2022-05-04 21:18:38 -04:00
TheiLLeniumStudios db11c7dcec Fix linting issues 2022-05-04 08:08:29 +00:00
MaximusR9 dc97e2f7b0 Add Remove and Update export functions
Added remove and update functions to dynamically remove or update jobs/items/gangs without having to restart the server.
2022-04-25 08:44:31 +05:00
Joel ad57a480b3 fix(clearinv): Player id definition
Fixes playerid from becoming "true" instead of the ID or source
2022-04-23 21:35:09 +01:00
Lionh34rt 43b107fd4c Update server/player.lua
Co-authored-by: ItsANoBrainer <itsanobrainergg@protonmail.com>
2022-04-22 22:24:15 +02:00