LEGUP icon indicating copy to clipboard operation
LEGUP copied to clipboard

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

Open jadeandtea opened this issue 1 year ago • 2 comments

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 avatar Sep 27 '24 20:09 jadeandtea

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 avatar Sep 27 '24 20:09 jadeandtea

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.

jadeandtea avatar Oct 01 '24 20:10 jadeandtea

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

jadeandtea avatar Oct 15 '24 20:10 jadeandtea