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.

Sign up for GitHub

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

Jump to bottom

Update Minesweeper Branch #872

Merged
merged 365 commits into from
Dec 2, 2024
Merged

Update Minesweeper Branch #872

merged 365 commits into from
Dec 2, 2024

Conversation

jadeandtea
Copy link
Collaborator

@jadeandtea jadeandtea commented Dec 2, 2024 •
edited
Loading

Description

Merging the dev branch into minesweeper to clean up the repository.

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 dev branch works.

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

kchiu1 and others added 30 commits April 9, 2024 17:21
@kchiu1
fixed test file, LastCellForNumberDirectRuleTest
90e273a
@kchiu1
Merge branch 'sudoku' of https://github.com/Bram-Hub/LEGUP into sudoku
cc612dd
@zacharybonagura
Completed and tested all rules to verify correctness.
10efd8b
@B-McCusker56
Added final rule images, adjusted nming converntions for rule images,…
51b5646 
… updated wiki with new rule images
@B-McCusker56
Merge pull request #800 from B-McCusker56/binary
5d9064a 
Added final rule images, adjusted naming conventions for rule images,…
@B-McCusker56
Added Wiki Contributions
cf59a17
@B-McCusker56
Added Binary Puzzle Presentation
15f6643
@B-McCusker56
Merge branch 'binary' of https://github.com/B-McCusker56/LEGUP into b…
9c90e2f 
…inary
@B-McCusker56
Merge pull request #802 from B-McCusker56/binary
65b07e9 
added noncode final commit components
@B-McCusker56
Added Wiki Contributions
714daee
@B-McCusker56
Merge branch 'Bram-Hub:binary' into binary
c1d8dd1
@B-McCusker56
Merge pull request #803 from B-McCusker56/binary
8260833 
Binary
@zacharybonagura
Add files via upload
44d0de5
@kchiu1
this does nothing
4d78d84 
its forcing me to do this
@kchiu1
Delete LastCellForNumberDirectRuleTest.java
d0ae7e5
@B-McCusker56
Made improvement to rule images
19fbed6
@B-McCusker56
Merge pull request #809 from B-McCusker56/binary
1301f88 
Made improvement to rule images
@charlestian23
Delete LEGUP Binary Puzzle Progress.pptx
2e17567
@charlestian23
Delete LEGUPBinaryPuzzleProgress.pptx
04f5728
@charlestian23
Delete WikiContributions.md
e8396af
@kchiu1
Merge branch 'dev' of https://github.com/Bram-Hub/LEGUP into sudoku
8fb51e2
@kchiu1
funny number change
9c80334
@Bram28
Automated Java code formatting changes
31c3ead
@kchiu1
Merge branch 'dev' into sudoku
63de212
@zacharybonagura
deleted blank file
6fe8768
@zacharybonagura
Merge branch 'binary' of https://github.com/Bram-Hub/LEGUP into binary
b7e5857
@charlestian23
Removed useless config file
bb64783
@charlestian23
Merge branch 'binary' of https://github.com/Bram-Hub/LEGUP into binary
fb8c02a
@kchiu1
Revert "Merge branch 'dev' into sudoku"
7c95d5f 
This reverts commit 63de212, reversing
changes made to 31c3ead.
@charlestian23
Merge branch 'dev' into binary
2e9fa05
zacharybonagura and others added 29 commits August 9, 2024 19:22
@zacharybonagura
Added code specifications to all missing methods and class descriptio…
e29ff9c 
…ns in all classes in ui/boardview directory
@zacharybonagura
Added code specifications to all missing methods and class descriptio…
b361a09 
…ns in all classes in ui/proofeditor/ruleview directory
@zacharybonagura
Removed PuzzleEditorDialog class rather implemented functionaliy dire…
63c3a9d 
…ctly into HomePanel
@zacharybonagura
Added code specifications to all missing methods and class descriptio…
12a3014 
…ns in all classes in ui/proofeditor/treeview directory
@zacharybonagura
Fixed number tile in binary where cycled through the unknown tile as …
86e8c38 
…well
@zacharybonagura
Added code specifications to all missing methods and class descriptio…
373ac5d 
…ns in all classes in ui directory
@zacharybonagura
Fixed clear history bug
87ad777
@zacharybonagura
Merge branch 'dev'
80dc899
@zacharybonagura
Fixed Binary Cell merge conflict
c6ec39e
@zacharybonagura
Merge branch 'master' into master
7b45547
@zacharybonagura
Merge branch 'star-battle'
a89e85b
@zacharybonagura
Starbattle rules causing checkstyle error on github
c274436
@zacharybonagura
Revert "Starbattle rules causing checkstyle error on github"
76aa2e7 
This reverts commit c274436.
@zacharybonagura
Revert "Merge branch 'star-battle'"
e51bcd3 
This reverts commit a89e85b, reversing
changes made to 7b45547.
@Chase-Grajeda
Merge pull request #852 from zacharybonagura/master
f6889a4 
Merge updated binary puzzle, proof editor, puzzle editor, home panel, bug fixes
@jadeandtea
Test Commit to see how reverting works
87d7ac1
@jadeandtea
Revert "Test Commit to see how reverting works"
c04eef1 
This reverts commit 87d7ac1.
@jadeandtea
Test commit to see how reverting a merge works
476486d
@jadeandtea
Merge branch 'dev' of https://github.com/Bram-Hub/LEGUP into dev
7aa29db
@jadeandtea
Revert "Test commit to see how reverting a merge works"
1044f1c 
This reverts commit 476486d.
@jadeandtea
Revert "Merge updated binary puzzle, proof editor, puzzle editor, hom…
81f05a4 
…e panel, bug fixes"
@jadeandtea
Merge pull request #857 from Bram-Hub/revert-852-master
ac61f10 
Revert "Merge updated binary puzzle, proof editor, puzzle editor, home panel, bug fixes"
@jadeandtea
Merge pull request #858 from zacharybonagura/master
1cc1c45 
Remerge updated binary puzzle, proof editor, puzzle editor, home panel, bug fixes
@Bram28
Automated Java code formatting changes
e0d3b3a
@jadeandtea
Merge pull request #860 from Bram-Hub/auto-format-code-1727468924
d3965f5 
Automated Java code formatting changes
@jadeandtea
Remove extraneous check of package name
53f29b0 
'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
Fixing merge issue
19a37c6
@jadeandtea
Fixing Merge Conflict
13a38b3
@jadeandtea
Merge branch 'minesweeper' into dev
3f250c2
@jadeandtea jadeandtea merged commit 2085954 into minesweeper Dec 2, 2024
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.