Resolve puzzle-editor merge conflicts #193
Merged
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
Fixes #104 and tested. Merging
Fix Previous State Placement
Closes #121 - requested changes implemented. If an input is 'ungradeable' then no score will be given in the .csv
…les-should-not-be-0 Update LegupUI.java
Add DS_Store to gitignore
[WIP] #106 changed redo from ctrl+y to ctrl+shift+z
Removed artificial splash screen delay; passed testing
Fixed EmptyField, LastCampingSpot, and TouchingTents rules
This reverts commit 91c88c6.
This reverts commit 1598af9.
…m/Bram-Hub/Legup into ui-issue105-clean_up_the_tool_bar
Accidentally change to gradle 7.3.1 by VSC.
Update LegupUI issue 152
faster than before
…ttleshipBoard` and `BattleshipType`. Also revised some JavaDoc comments for better clarity and easier readability.
Implement fill in row, make some fixes for no tree for tent
Update LegupUI.java issue 167
Battleship Enums Changed and Revised JavaDoc Comments
Create LICENSE
- Implementation - Incomplete test Also some JavaDoc revisions.
Commented out debugging print statement to make console output more readable
already increase the speed of all three kinds of rule
Issue 114: Zoom Window Bug for Slider FIXED
Battleship: Adjacent Ships Contradiction Rule
Fixes for TreeTent rules not dependent on links
…ection Update RuleFrame.java
cjreed121
changed the title
cjreed121
approved these changes
Jul 16, 2022
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.
No description provided.