Merge master into dev #856
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixed bugs and continued Contradiciton rule work
Three adjacent CR complete and prelim testing done
Fixed checkStyle errors
Fixed checkStyle errors
…IrectRule fixed minor bugs
OneZeroCaseRule working version complete, began writing SurroundPairD…
…umns, added method to get all types of cells in row.
… testing, fixed minor bug
…ctions in OneTileGap and SurroundPair Direct Rules
Fixed buggy three adjacent contradiction rule
# Conflicts: # src/main/java/edu/rpi/legup/puzzle/binary/rules/SurroundPairDirectRule.java # src/main/java/edu/rpi/legup/puzzle/binary/rules/ThreeAdjacentContradictionRule.java
…ns in all classes in controller directory
…ns in all classes in history directory
…ns in all classes in model directory
…ns in all classes in gameboard directory
…ns in all classes in observer directory
…ns in all classes in model/rules directory
…ns in all classes in model/tree directory
…ns in all classes in model directory
Star battle
…ns in all classes in ui/boardview directory
…ns in all classes in ui/proofeditor/ruleview directory
…ctly into HomePanel
…ns in all classes in ui/proofeditor/treeview directory
…ns in all classes in ui directory
This reverts commit c274436.
Merge updated binary puzzle, proof editor, puzzle editor, home panel, bug fixes
|
Going to close this merge and attempt to revert the merge directly into master, then recommit into dev and merge into master. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
The dev branch is behind after the summer 2024 semester commit.
Type of change
How Has This Been Tested?
Master branch is stable.
Checklist: