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

chore: General cleanup roundup #1444

Merged
merged 19 commits into from
Feb 10, 2024

Conversation

jadebenn
Copy link
Collaborator

@jadebenn jadebenn commented Feb 3, 2024

Split out unrelated changes from #1442. General cleanup of things I noticed while I was working on the TryParse branch.

dChatServer/PlayerContainer.h Outdated Show resolved Hide resolved
dCommon/dEnums/dCommonVars.h Show resolved Hide resolved
dGame/dComponents/QuickBuildComponent.h Outdated Show resolved Hide resolved
@jadebenn jadebenn requested a review from EmosewaMC February 3, 2024 23:52
@EmosewaMC
Copy link
Collaborator

I will wait until you finish adding in random changes to review this.

@jadebenn
Copy link
Collaborator Author

jadebenn commented Feb 4, 2024

All the changes I have added to this since the initial commit have been to respond to your requests.

@jadebenn jadebenn requested a review from EmosewaMC February 4, 2024 20:18
@jadebenn
Copy link
Collaborator Author

looks like I finally got the instantiation problem fixed. should be ready to go unless you all have any other feedback here

dCommon/Amf3.h Outdated Show resolved Hide resolved
EmosewaMC
EmosewaMC previously approved these changes Feb 10, 2024
EmosewaMC
EmosewaMC previously approved these changes Feb 10, 2024
@jadebenn
Copy link
Collaborator Author

jadebenn commented Feb 10, 2024

EDIT: nope

@jadebenn
Copy link
Collaborator Author

aaaand false alarm. We're good.

aronwk-aaron
aronwk-aaron previously approved these changes Feb 10, 2024
@jadebenn jadebenn dismissed stale reviews from aronwk-aaron and EmosewaMC via b8b8d92 February 10, 2024 18:10
@jadebenn
Copy link
Collaborator Author

...wow, they really require re-review for fixing merge conflicts?

@jadebenn
Copy link
Collaborator Author

annoying.

Copy link
Member

@aronwk-aaron aronwk-aaron left a comment

Choose a reason for hiding this comment

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

Pending ci

@aronwk-aaron aronwk-aaron merged commit 29666a1 into DarkflameUniverse:main Feb 10, 2024
4 checks passed
@jadebenn jadebenn deleted the CleanupRoundup branch February 11, 2024 01:23
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.

3 participants