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

Minesweeper #815

Merged
merged 63 commits into from
May 5, 2024
Merged

Minesweeper #815

merged 63 commits into from
May 5, 2024

Conversation

vockek
Copy link
Collaborator

@vockek vockek commented Apr 16, 2024

Description

Initial Minesweeper implementation with several rules and a ui.

Closes #(issue)

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?

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

FisherLuba and others added 30 commits January 27, 2024 21:29
@FisherLuba
Initial Minesweeper implementation work
f6f2a62
@FisherLuba
Merge pull request #709 from FisherLuba/dev
354cb78 
Initial Minesweeper implementation work
@FisherLuba
Add Unset tile type
a3a2a80
@FisherLuba
Merge pull request #712 from FisherLuba/dev
8ad5acb 
Add Unset tile type
@philippark
Init elements
3030805 
Created initial classes for bomb, flag, utilities, and contradiction rule.
@FisherLuba
Make clicking tiles cycle between numbers, bomb, and empty tiles.
d592e32
@FisherLuba
Fix checkstyle errors
75e2ca7
@vockek
Added
89fbe94
@vockek
Revert "Added"
f8497f7 
This reverts commit 89fbe94.
@vockek
Added
194eb8b
@vockek
Create 123456
ace7122
@vockek
Revert "Create 123456"
5f1b13e 
This reverts commit ace7122.
@Chase-Grajeda
Merge branch 'minesweeper' into dev
5b4a883
@Chase-Grajeda
Merge pull request #732 from FisherLuba/dev
e4d8566 
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
@vockek
Created Bomb or Filled Case Rule
eb5c8a0
@vockek
Merge branch 'Bram-Hub:minesweeper' into minesweeper
c5654d3
@vockek
Update BombOrFilledCaseRule.java
f521daa 
removed fillapix imports
@vockek
Various additions
d662452 
Added the unset puzzle element, added the minesweeper board copy function, fixed the bomb or filled case rule
@vockek
Merge branch 'minesweeper' of https://github.com/vockek/LEGUP into mi…
ba56e23 
…nesweeper
@vockek
Revert "Create 123456"
99d0ecf 
This reverts commit ace7122.
@FisherLuba
Merge remote-tracking branch 'upstream/dev' into dev
e151aaa 
# Conflicts:
#	src/main/resources/edu/rpi/legup/legup/config
@FisherLuba
Merge remote-tracking branch 'upstream/dev' into dev
1d4cb59
@FisherLuba
Update Minesweeper classes to use newer Java features
38a4c24
@FisherLuba
Add documentation to Minesweeper classes
fcea59a
@vockek
Added helper functions to utilities class
294814f 
Added helper functions used for getting cells adjacent to flag, as well as combinations of possible bomb tiles.
@vockek
Added function to retrieve a tile's number
6b1f812
@vockek
Create SatisfyFlagCaseRule.java
69aaf17
@vockek
Fixed "bomb or filled" case rule's picture
e59a94e
@vockek
Fixed "satisfy flag" case rule's picture
7989d80
@FisherLuba
Merge pull request #745 from FisherLuba/dev
36920cb 
Dev
vockek and others added 22 commits March 12, 2024 17:01
@vockek
Revert "temp"
ee4b707 
This reverts commit b4c8ed9.
@vockek
Update minesweeperUtilities.java
d8e27aa
@vockek
Merge branch 'minesweeper-upstream' into minesweeper
4e63e71
@FisherLuba
Add bomb image
0e89c11
@FisherLuba
Added reference sheet for Minesweeper tiles for puzzle editor
b121d28
@FisherLuba
Merge pull request #753 from FisherLuba/dev
27d831e 
Add bomb or filled case rule and update the config to add minesweeper
@vockek
Merge branch 'minesweeper2' of https://github.com/vockek/LEGUP into m…
23ef262 
…inesweeper2
@vockek
Merge branch 'minesweeper2' of https://github.com/vockek/LEGUP into m…
e3d78ff 
…inesweeper2
@vockek
Added Minesweeper Utility Functions
3a1cee2 
-Fixed Bomb or Filled case rule picture
-Added getTileNumber and setCellType functions
-added 5x5 test puzzle
@vockek
Fixed "satisfy flag" case rule
3022d86
@Bram28
Automated Java code formatting changes
f9d52a3
@vockek
Merge pull request #1 from vockek/minesweeper2
3164d44
@vockek
Revert "Automated Java code formatting changes"
62b3c71 
This reverts commit f9d52a3.
@vockek
Added "More Bombs Than Flag" Contradiction Rule
9bffc7f
@vockek
Delete Unset (replaced by UnsetTile)
5a52070
@vockek
Added dot to empty tile image
5e461ec
@vockek
Fixed "Satisfy Flag" Case Rule Picture
a45ed95
@vockek
Merge pull request #771 from vockek/minesweeper
6230b7b
@vockek
Fixed "satisfy flag" bug
ef36851 
fixed bug where "satisfy flag" allowed you to select an empty tile instead of a flag tile
@vockek
Added "Finish With Bombs" Direct Rule
bbf799b
@vockek
Update FinishWithBombsDirectRule.java
8c653d8
@vockek
Merge pull request #813 from vockek/minesweeper
4a288ee 
Added "Finish with Bombs" direct rule
charlestian23
charlestian23 approved these changes May 5, 2024
View reviewed changes
Copy link
Collaborator

@charlestian23 charlestian23 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fine, puzzle is in progress, so not going to do as rigorous of a check as normal. Test also seem to be passing fine, so nothing that already works is broken with this new puzzle.

@charlestian23 charlestian23 merged commit d68859b into dev May 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@charlestian23 charlestian23 charlestian23 approved these changes

@Chase-Grajeda Chase-Grajeda Awaiting requested review from Chase-Grajeda

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@vockek @charlestian23 @FisherLuba @philippark @Chase-Grajeda @Bram28