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

[SM64] Settings Rework #280

Open
wants to merge 111 commits into
base: main
Choose a base branch
from
Open

[SM64] Settings Rework #280

wants to merge 111 commits into from

Conversation

Lilaa3
Copy link
Collaborator

@Lilaa3 Lilaa3 commented Jan 6, 2024

Some reorganizing, putting stuff into sm64 specific property groups, new repo settings system, some cleaner ui with more warnings, create simple level button, new warnings for import and export ROMs just because i was adding them to the ui anyways.
Tried to keep this within scope as much as possible.
Please feel free to comment on anything and everything.

necessary for future properties groups to be included into the sm64 scene class (like animation export in my future animation rework pr)
@Dragorn421
Copy link
Contributor

merge conflicts are most likely from black formatting commit 7031047

to merge main I suggest

git fetch upstream main
git merge 70310474e4627ae3f0a3a43a81aced4aa1200cf3^ # note ^ at the end for parent commit
# resolve conflicts manually if any
git merge 70310474e4627ae3f0a3a43a81aced4aa1200cf3
# resolve conflicts by accepting all current (rejecting all incoming changes which are only formatting), then run black
git merge upstream/main
# resolve conflicts manually if any

@Lilaa3
Copy link
Collaborator Author

Lilaa3 commented Jan 7, 2024

All done :)

@Lilaa3
Copy link
Collaborator Author

Lilaa3 commented Jan 7, 2024

Oh and I guess I will wait for sauren's pr to be approved I guess

Copy link
Contributor

@Dragorn421 Dragorn421 left a comment

Choose a reason for hiding this comment

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

partial review

fast64_internal/sm64/settings/properties.py Outdated Show resolved Hide resolved
fast64_internal/sm64/settings/properties.py Outdated Show resolved Hide resolved
fast64_internal/sm64/sm64_utility.py Outdated Show resolved Hide resolved
fast64_internal/sm64/sm64_utility.py Outdated Show resolved Hide resolved
fast64_internal/sm64/sm64_utility.py Outdated Show resolved Hide resolved
fast64_internal/sm64/sm64_objects.py Outdated Show resolved Hide resolved
fast64_internal/panels.py Outdated Show resolved Hide resolved
fast64_internal/f3d/f3d_material.py Show resolved Hide resolved
Copy link
Contributor

@Dragorn421 Dragorn421 left a comment

Choose a reason for hiding this comment

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

Another round

Can you document the "(sm64) repo settings" feature in the sm64 readme, say it exists, the default name, what's in it, when is it written/read...

fast64_internal/sm64/sm64_anim.py Outdated Show resolved Hide resolved
fast64_internal/sm64/sm64_f3d_parser.py Show resolved Hide resolved
fast64_internal/sm64/sm64_geolayout_parser.py Outdated Show resolved Hide resolved
fast64_internal/sm64/sm64_utility.py Outdated Show resolved Hide resolved
fast64_internal/utility.py Outdated Show resolved Hide resolved
fast64_internal/sm64/settings/panels.py Outdated Show resolved Hide resolved
fast64_internal/sm64/settings/properties.py Outdated Show resolved Hide resolved
fast64_internal/sm64/settings/properties.py Outdated Show resolved Hide resolved
@Lilaa3
Copy link
Collaborator Author

Lilaa3 commented Jan 8, 2024

Another round

Can you document the "(sm64) repo settings" feature in the sm64 readme, say it exists, the default name, what's in it, when is it written/read...

will do this soon!

@Lilaa3 Lilaa3 changed the title [SM64] Small Settings Rework [SM64] Settings Rework May 25, 2024
@Lilaa3 Lilaa3 marked this pull request as ready for review May 25, 2024 12:28
Copy link
Collaborator

@jesusyoshi54 jesusyoshi54 left a comment

Choose a reason for hiding this comment

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

I tested this and it worked pretty well, but I didn't do an extensive test and combover of all the code because there was a lot of changes. I imagine the rest of the code will be good but I need to look at it closer.

__init__.py Show resolved Hide resolved
fast64_internal/operators.py Show resolved Hide resolved
fast64_internal/sm64/settings/panels.py Outdated Show resolved Hide resolved
fast64_internal/sm64/settings/properties.py Outdated Show resolved Hide resolved
fast64_internal/sm64/sm64_objects.py Outdated Show resolved Hide resolved
fast64_internal/sm64/sm64_objects.py Outdated Show resolved Hide resolved
fast64_internal/utility.py Outdated Show resolved Hide resolved
fast64_internal/sm64/tools/operators.py Outdated Show resolved Hide resolved
fast64_internal/panels.py Show resolved Hide resolved
fast64_internal/sm64/settings/properties.py Outdated Show resolved Hide resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
codebase Code maintenance/cleanup enhancement New feature or request sm64 Has to do with the Super Mario 64 side
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants