merge downstream changes#1924
Merged
Merged
Conversation
* fix: remove item if swap fail to prevent dupe Signed-off-by: Ceeb <cyril.beeckman@gmail.com> * lint: fix indentation Signed-off-by: Ceeb <cyril.beeckman@gmail.com> --------- Signed-off-by: Ceeb <cyril.beeckman@gmail.com>
… target with canSteal (#35)
…en removed from weapons (#39)
* Update client.lua * Update client.lua * Update client.lua
-> allows users to open inventories by passing the incorrect invType regardless of distance and security checks
Co-authored-by: Heros451 <thatoneheros451@gmail.com>
* Enhance ND:updateCharacter event Signed-off-by: Andy <86536434+Andyyy7666@users.noreply.github.com> * Enhance ND:updateCharacter event Signed-off-by: Andy <86536434+Andyyy7666@users.noreply.github.com> --------- Signed-off-by: Andy <86536434+Andyyy7666@users.noreply.github.com>
fix degrade not working when durability always 100 Signed-off-by: NCDev <55439243+xenfovn@users.noreply.github.com>
* Refactor hasGroup function to handle rank requirements Signed-off-by: 137ElPro <103851494+137ElPro@users.noreply.github.com> * Enhance group rank validation logic Refactor group rank checking to handle multiple requirements. Signed-off-by: 137ElPro <103851494+137ElPro@users.noreply.github.com> * Refactor condition checks for groupRank in client.lua Signed-off-by: 137ElPro <103851494+137ElPro@users.noreply.github.com> * changes for pull Signed-off-by: 137ElPro <103851494+137ElPro@users.noreply.github.com> --------- Signed-off-by: 137ElPro <103851494+137ElPro@users.noreply.github.com>
… vehicle (#78) fix(client): weaponwheel manual override being "cancelled" by exiting vehicle
* feat(client): export based setting for altering the getPlayerName method * tweak(utils/client): removed useless luadoc inject-field rule disable
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
14 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.