Fall 2024 Merge #883
Open
Fall 2024 Merge #883
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
Initial Minesweeper implementation work
added some basic functions to GridRegion
Add Unset tile type
Added rippleeffect folder within puzzles so we can begin implementing and rendering the demo puzzle Added RippleEffect.java Added RippleEffectCell.java Added RippleEffectImporter.java Added RippleEffectView.java
Added more dependencies for RippleEffect board Added config for RippleEffect editing support
Created initial classes for bomb, flag, utilities, and contradiction rule.
This reverts commit 89fbe94.
This reverts commit ace7122.
Changes are well-contained within the Minesweeper classes and don't appear to create any conflicts. No puzzle files yet to test UI changes. Compilation tests pass. Merging
removed fillapix imports
Added the unset puzzle element, added the minesweeper board copy function, fixed the bomb or filled case rule
This reverts commit ace7122.
# Conflicts: # src/main/resources/edu/rpi/legup/legup/config
New images for all of the minesweeper rules
changed a ton of stuff to use more consistent wording (such as saying mine instead of bomb) and also commented some code that needed comments
title. also a couple other tiny improvements
Created the test suites for both of the case rules. Also some minor changes
Test suites for both of the contradiction rules
Update Minesweeper Branch
delete files
more bug fixes
some small improvements and comments
New rule isolatemine - a mine must see a number cell. Added the rule and test suite for the rule.
Minesweeper changes
Updated puzzles to add persistent tags, hashed the exported solved state of the board, and updated batch grader to new format
Minesweeper rules, test suite, and bug fixes
Workflow file to change version
|
I'm not sure how GitHub actions work and whether or not they are supposed to appear as the file itself is merged in, but everything else looks right. |
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
This merge contains all stable commits made by the RCOS team during the Fall '24 semester, which includes:
Type of change
How Has This Been Tested?
The dev branch appears to be stable with all old and new puzzle types. The batch grader also works as intended with small-scale testing. The merge into master will test the functionality of the version updater.
Checklist: