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.

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

October Merge #636

Merged
merged 37 commits into from
Oct 10, 2023
Merged

October Merge #636

merged 37 commits into from
Oct 10, 2023

Commits on Sep 29, 2023

  1. Region Based Changes (#559)

    Co-authored-by: Hanson Gu <[email protected]>
    19690ao and hansongu123 authored Sep 29, 2023
    Configuration menu
    Copy the full SHA
    50ba53f View commit details
    Browse the repository at this point in the history
  2. Short Truth Table Puzzle Editor (#451)

    * Created files for STT elements
    
    * Renamed Tiles classes to Elements to match package name
    
    Also added an elements reference sheet and renamed rules reference sheet accordingly
    
    * More progress made
    
    This won't compile, just saving progress made
    
    * More progress being made
    
    * Fixed file name typo and added placeholder tiles
    
    * Added image paths
    
    * Created element classes and added placeholder tile images (#452)
    
    * Renamed Tiles classes to Elements to match package name
    
    Also added an elements reference sheet and renamed rules reference sheet accordingly
    
    * More progress made
    
    This won't compile, just saving progress made
    
    * More progress being made
    
    * Fixed file name typo and added placeholder tiles
    
    * Added image paths
    
    * Set the current board on boardView
    
    * Fixed typo and turned on STT puzzle editor for testing
    
    * Added preliminary valid dimensions checker
    
    This will most definitely change in the future, hopefully can change to accept a number of statements
    
    * Fixed image file paths
    
    * Added ActionListener
    
    Allows us to determine what puzzle is selected by the user
    
    * Hide rows and columns input for Short Truth Table
    
    * Added text area for Short Truth Table
    
    * Added scrollbars to show up as needed
    
    * Reformatted code
    
    * More code reformatting
    
    * Even more reformatting
    
    * Separate the data from the TextArea into different lines
    
    * Did some researching/testing
    
    Tested certain variable values with a STT file with no true/false values
    
    * Made more progress
    
    Added new methods to handle creating Short Truth Table boards from an array of strings
    
    * Added a bunch of TODOs
    
    - Implemented a couple functions to be used later
    - Added a bunch of TODO comments for future work
    
    * Made some more progress
    
    * Implemented abstract methods from PuzzleImporter
    
    * Added abstract methods to Fillapix and added other exception reporting
    
    * CheckStyle formatting
    
    * Removed a TODO comment
    
    * Statements show up in puzzle editor
    
    Fixed a bug where the importer was not properly being initialized. Statements now show up in the puzzle editor.
    
    * Removed empty statements
    
    * Changed InvalidFormatException to IllegalArgumentException
    
    * Remove argument that has already been caught
    
    * Removed elements that will not be used
    
    * Added puzzle editor cell clicking functionality
    
    * Added ability to toggle certain logical elements
    
    * New icons and more functionality implemented
    
    * Fixed a bug where spacer rows could be modified
    
    * Added statement error checking
    
    * Fixed formatting
    
    * Only one logic symbol element needed
    
    * Changed InputMismatchException to UnsupportedOperationException
    
    * Renamed variables to not be STT specific
    
    * Finding initial issue and starting fix
    
    * Issue is statement copying and modifying
    
    * STT exporter now working. Overrode setCell for STTBoard.
    
    * Added code documentation
    
    * removed testing println()
    
    * Gradle fixes
    
    * Revert "Merge pull request #545 from MMosley502/puzzle_editor-short_truth_table-file_saving"
    
    This reverts commit 2e82547, reversing
    changes made to beb60a2.
    
    * Saving files now works
    
    * Fixed the blank element to be categorized as a placeable element
    
    * Fixed a bug where file wouldn't save due to batch grader updates
    
    * Reformatted code in STT
    
    * Reformatted code again
    
    * MORE REFORMATTING
    
    Pls like my code CheckStyle
    
    ---------
    
    Co-authored-by: Matthew Mosley <[email protected]>
    Co-authored-by: MMosley502 <[email protected]>
    3 people authored Sep 29, 2023
    Configuration menu
    Copy the full SHA
    f3dbafb View commit details
    Browse the repository at this point in the history
  3. Have null changes be valid and fix IsolatedBlackContradicitonRule err…

    …or message (#561)
    
    * Get Tests to be called
    
    Revert "Create first cypress test template"
    
    This reverts commit 3e50909.
    
    First commit
    
    Finish Lightup tests
    
    * Add more tests
    
    Update TestRunner.java
    
    * Somehow ended up in the wrong spot
    
    Fix Import
    
    * Please let this be the fix
    
    Update TreeTransition.java
    
    Update TreeTransition.java
    
    Update DirectRule.java
    
    Check to see which is not correct
    
    Update ElementController.java
    
    Revert "maybe the null is making it think that it's not valid"
    
    This reverts commit 7bf1de0d66ced6749ee37fbb9c252636b2fcdc79.
    
    Just trying to change color
    
    Revert "Just trying to change color"
    
    This reverts commit ec44695ee578d664055d135a668927a0fd900f5d.
    
    Revert "maybe the null is making it think that it's not valid"
    
    This reverts commit 3f162fbdc32e6fbd23da321a14a6af96f0ff520d.
    
    Check to see which is not correct
    
    Revert "Check to see which is not correct"
    
    This reverts commit 136b0a41b9d103e6f3e9a7f8cd5d970bf76b050b.
    
    Update TreeTransition.java
    
    Update TreeTransition.java
    
    Revert "Update TreeTransition.java"
    
    This reverts commit cde45bb9001cfbfa4f6e2a49b4e9990d2fa7ad33.
    
    * Fix error with isolated Black
    
    Fix error message with isolated black
    
    * Removed excess whitespace and imports. Added short JavaDoc for `TestRunner.java`
    
    ---------
    
    Co-authored-by: Charles Tian <[email protected]>
    Co-authored-by: Bram van Heuveln <[email protected]>
    Co-authored-by: Corppet <[email protected]>
    4 people authored Sep 29, 2023
    Configuration menu
    Copy the full SHA
    bcb8629 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2023

  1. Fixed a bug

    charlestian23 committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    f1c7985 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #625 from charlestian23/dev

    Null board when creating new puzzle file bug fix
    Chase-Grajeda authored Oct 3, 2023
    Configuration menu
    Copy the full SHA
    7ff8873 View commit details
    Browse the repository at this point in the history
  3. Update BlackTile.java

    Black tile should not be placeable
    charlestian23 committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    473300c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    0832621 View commit details
    Browse the repository at this point in the history
  5. ID error

    charlestian23 committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    23d6558 View commit details
    Browse the repository at this point in the history
  6. Some Fixes to Recently Discussed UX Bugs (#563)

    * frame and panels default sizes, default pos on screen
    
    * hardcoded version number
    
    * homepanel default size
    
    * set panels' own sizes
    
    * some changes
    
    * Removed unused import
    
    ---------
    
    Co-authored-by: Charles Tian <[email protected]>
    Co-authored-by: Corppet <[email protected]>
    3 people authored Oct 3, 2023
    Configuration menu
    Copy the full SHA
    145e316 View commit details
    Browse the repository at this point in the history
  7. Oops pushed the wrong file

    Yeah some tiles work now but this is the ID error
    charlestian23 committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    1357dbd View commit details
    Browse the repository at this point in the history
  8. Number Tile working

    charlestian23 committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    f3ba447 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    e03cdf9 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2023

  1. Update Exporter (#627)

    * Update Exporter
    
    * Delete Test_Save
    
    ---------
    
    Co-authored-by: Charles Tian <[email protected]>
    ThisMatt and charlestian23 authored Oct 6, 2023
    Configuration menu
    Copy the full SHA
    b603f1a View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2023

  1. Configuration menu
    Copy the full SHA
    47a57d2 View commit details
    Browse the repository at this point in the history
  2. Create run-tests.yml

    charlestian23 committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    ef1be26 View commit details
    Browse the repository at this point in the history
  3. Update run-tests.yml

    charlestian23 committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    20ff3dc View commit details
    Browse the repository at this point in the history
  4. Update run-tests.yml

    charlestian23 committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    4df8313 View commit details
    Browse the repository at this point in the history
  5. Update run-tests.yml

    charlestian23 committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    60c99db View commit details
    Browse the repository at this point in the history
  6. Update run-tests.yml

    charlestian23 committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    84517f8 View commit details
    Browse the repository at this point in the history
  7. Windows things

    charlestian23 committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    57532c4 View commit details
    Browse the repository at this point in the history
  8. Added print messages

    charlestian23 committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    aac1ed4 View commit details
    Browse the repository at this point in the history
  9. More Windows things

    charlestian23 committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    25d559a View commit details
    Browse the repository at this point in the history
  10. Debugging

    charlestian23 committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    48479a6 View commit details
    Browse the repository at this point in the history
  11. Update run-tests.yml

    charlestian23 committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    28c06bc View commit details
    Browse the repository at this point in the history
  12. Update run-tests.yml

    charlestian23 committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    7377a15 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    49fb14f View commit details
    Browse the repository at this point in the history
  14. Didn't work

    charlestian23 committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    cfeee6a View commit details
    Browse the repository at this point in the history
  15. Update run-tests.yml

    charlestian23 committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    7b49c11 View commit details
    Browse the repository at this point in the history
  16. Update run-tests.yml

    charlestian23 committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    4029b7c View commit details
    Browse the repository at this point in the history
  17. Create DummyTest.java

    For debugging purposes
    charlestian23 committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    19f0c26 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    f2b1cfa View commit details
    Browse the repository at this point in the history
  19. Update run-tests.yml

    charlestian23 committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    7fd577b View commit details
    Browse the repository at this point in the history
  20. Update run-tests.yml

    Get rid of all this info
    charlestian23 committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    8675598 View commit details
    Browse the repository at this point in the history
  21. Deleted the dummy tests

    charlestian23 committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    4bd1787 View commit details
    Browse the repository at this point in the history
  22. Merge pull request #634 from charlestian23/github-actions-test-suite

    Run test suite with GitHub Actions
    Chase-Grajeda authored Oct 10, 2023
    Configuration menu
    Copy the full SHA
    a52b65d View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    f98bc7d View commit details
    Browse the repository at this point in the history
  24. Merge pull request #629 from charlestian23/dev

    Light Up puzzle editor fix
    Chase-Grajeda authored Oct 10, 2023
    Configuration menu
    Copy the full SHA
    97be2be View commit details
    Browse the repository at this point in the history