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.

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

refactor: move to modules, ox_lib, style fixes #34

Merged
merged 14 commits into from
Sep 25, 2023
Merged

refactor: move to modules, ox_lib, style fixes #34

merged 14 commits into from
Sep 25, 2023

Conversation

mafewtm
Copy link
Member

@mafewtm mafewtm commented Sep 23, 2023

Description

  • Moves to modules
  • Further implementation of ox_lib
  • Style fixes

Special thanks to mockdot for his help with the ignore.lua addeventhandler.

I did not include a fix for the carwash as this is already done in #33. My apologies again.

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.

client/fireworks.lua Outdated Show resolved Hide resolved
client/consumables.lua Outdated Show resolved Hide resolved
client/consumables.lua Outdated Show resolved Hide resolved
client/consumables.lua Outdated Show resolved Hide resolved
client/consumables.lua Outdated Show resolved Hide resolved
client/vehicletext.lua Outdated Show resolved Hide resolved
fxmanifest.lua Outdated Show resolved Hide resolved
fxmanifest.lua Outdated Show resolved Hide resolved
@mafewtm
Copy link
Member Author

mafewtm commented Sep 25, 2023

Merged into main to correct a conflict #35 produced with this PR when fixing ignore.lua

client/ignore.lua Outdated Show resolved Hide resolved
fxmanifest.lua Outdated Show resolved Hide resolved
@Manason
Copy link
Member

Manason commented Sep 25, 2023

Fix conflicts

@mafewtm
Copy link
Member Author

mafewtm commented Sep 25, 2023

Merged into main to correct a conflict #36 produced with this PR when updating commands to OX which were already done in this PR.

@Manason Manason merged commit b7ad3b9 into Qbox-project:main Sep 25, 2023
1 of 2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants