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

Remerge updated binary puzzle, proof editor, puzzle editor, home panel, bug fixes #859

Merged
merged 11 commits into from
Oct 15, 2024

Conversation

jadeandtea
Copy link
Collaborator

Description

Merge updated binary puzzle, including new rules, images, functionality.
New look and functionality for proof editor.
New look and functionality for puzzle editor.
Revised home panel.
Many bug fixes throughout the engine

Continuation merge from #852.

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Enhancement (improvement to an already existing feature)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

How Has This Been Tested?

The master branch was stable before reverting the merge. There have been no other commits.

Checklist:

  • I have performed a self-review of my code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation (if applicable)
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes

@jadeandtea
Copy link
Collaborator Author

My fork doesn't have a dev branch, and I accidentally committed directly to the main repository's branch. I reverted the commits so that no files were changed.

@jadeandtea
Copy link
Collaborator Author

For some reason, the autoformatter's changes cause a merge conflict in every file where it shifts around one or two words in a comment. When I try to override all the merge conflicts in the terminal, it seems like it directly commits to master, which I don't want to do. I'll see if there is an alternative way to merge, but if I can't find something by next week, I'll just commit the autoformatter merges directly to master.

'c' is found using LegupUtils.getClasses("edu.rpi.legup.puzzle"), so it will start with it.
Fixes issue with STT rules not showing up.
@jadeandtea
Copy link
Collaborator Author

Looks good, this merge should bring back the summer semester changes to master.

@jadeandtea jadeandtea merged commit 3b1d6e8 into master Oct 15, 2024
16 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