Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updates #7

Merged
merged 34 commits into from
Sep 17, 2023
Merged

Updates #7

merged 34 commits into from
Sep 17, 2023

Conversation

DevX32
Copy link
Contributor

@DevX32 DevX32 commented Jul 28, 2023 •
edited
Loading

Description

removed lockpick exports and added oxlib skillcheck and changed callbacks

Checklist

  • I have personally loaded this code into an updated Qbox project and checked all of its functionality.
  • My code fits the style guidelines.
  • My PR fits the contribution guidelines.

Manason
Manason requested changes Sep 6, 2023
View reviewed changes
Copy link
Member

@Manason Manason left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you check if these events were being used by other qbx resources?

config.lua Outdated Show resolved Hide resolved
config.lua Outdated Show resolved Hide resolved
config.lua Outdated Show resolved Hide resolved
fxmanifest.lua Outdated Show resolved Hide resolved
DevX32 and others added 2 commits September 6, 2023 07:37
@DevX32 @Manason
Update config.lua
216bd61 
Co-authored-by: Manason <[email protected]>
@DevX32 @Manason
Update fxmanifest.lua
d576af7 
Co-authored-by: Manason <[email protected]>
@DevX32
Copy link
Contributor Author

DevX32 commented Sep 7, 2023

Did you check if these events were being used by other qbx resources?

i checked all working

Manason
Manason requested changes Sep 15, 2023
View reviewed changes
Copy link
Member

@Manason Manason left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure that we should rename all these events as it will break compatibility with resources relying on the event name being qb.

@DevX32 DevX32 changed the title Update config.lua Updates Sep 15, 2023
@DevX32 DevX32 requested a review from Manason September 15, 2023 14:35
Manason
Manason requested changes Sep 15, 2023
View reviewed changes
Copy link
Member

@Manason Manason left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unrelated; Replacing exports to get core object with core modules would be a good change as well

client/main.lua Outdated Show resolved Hide resolved
fxmanifest.lua Outdated Show resolved Hide resolved
client/main.lua Outdated Show resolved Hide resolved
Manason
Manason requested changes Sep 16, 2023
View reviewed changes
client/main.lua Outdated Show resolved Hide resolved
@DevX32 DevX32 requested a review from Manason September 17, 2023 01:00
Manason
Manason reviewed Sep 17, 2023
View reviewed changes
client/main.lua Outdated Show resolved Hide resolved
@DevX32 @Manason
correct callback
462e63a 
Co-authored-by: Manason <[email protected]>
@DevX32 DevX32 requested a review from Manason September 17, 2023 03:17
Manason
Manason reviewed Sep 17, 2023
View reviewed changes
server/main.lua Outdated Show resolved Hide resolved
@Manason Manason merged commit 4f9b949 into Qbox-project:main Sep 17, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Manason Manason Manason approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@DevX32 @Manason