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

Add Settings feature #24

Open
wants to merge 68 commits into
base: master
Choose a base branch
from
Open

Add Settings feature #24

wants to merge 68 commits into from

Commits on Sep 27, 2021

  1. Add luca.txt to main branch

    Luca Nickel committed Sep 27, 2021
    Configuration menu
    Copy the full SHA
    7fdc344 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from 56luca/main 

    Add luca.txt to main branch
    @eliasb1
    eliasb1 authored Sep 27, 2021
    Configuration menu
    Copy the full SHA
    af0c07f View commit details
    Browse the repository at this point in the history

  3. Created janae.txt file

    @jfarinas96
    jfarinas96 committed Sep 27, 2021
    Configuration menu
    Copy the full SHA
    35c6433 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #2 from jfarinas96/testbranch 

    Created janae.txt file
    @eliasb1
    eliasb1 authored Sep 27, 2021
    Configuration menu
    Copy the full SHA
    e5dd165 View commit details
    Browse the repository at this point in the history

  5. Change luca.txt in testBranch

    Luca Nickel committed Sep 27, 2021
    Configuration menu
    Copy the full SHA
    937907c View commit details
    Browse the repository at this point in the history

  6. Merge pull request #3 from 56luca/testBranch 

    Change luca.txt in testBranch
    @eliasb1
    eliasb1 authored Sep 27, 2021
    Configuration menu
    Copy the full SHA
    82c561d View commit details
    Browse the repository at this point in the history

  7. Adding practice file

    @Josholeary
    Josholeary committed Sep 27, 2021
    Configuration menu
    Copy the full SHA
    f74ef37 View commit details
    Browse the repository at this point in the history

  8. Added Sophie.txt

    @sibylle221
    sibylle221 committed Sep 27, 2021
    Configuration menu
    Copy the full SHA
    b7ee2d6 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #4 from Josholeary/main 

    Adding practice file
    @eliasb1
    eliasb1 authored Sep 27, 2021
    Configuration menu
    Copy the full SHA
    15f7c06 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #5 from sibylle221/main 

    Added Sophie.txt
    @eliasb1
    eliasb1 authored Sep 27, 2021
    Configuration menu
    Copy the full SHA
    98cc497 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2021

  1. Pause function added

    @Josholeary
    Josholeary committed Nov 18, 2021
    Configuration menu
    Copy the full SHA
    d49ad32 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #6 from Josholeary/main 

    Pause function added
    @eliasb1
    eliasb1 authored Nov 18, 2021
    Configuration menu
    Copy the full SHA
    0f1ae1b View commit details
    Browse the repository at this point in the history

  3. Added missing font file

    @Josholeary
    Josholeary committed Nov 18, 2021
    Configuration menu
    Copy the full SHA
    9a464d8 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #7 from Josholeary/main 

    Add missing font file
    @eliasb1
    eliasb1 authored Nov 18, 2021
    Configuration menu
    Copy the full SHA
    25f51b6 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2021

  1. Delete txt files from git practice and update gitignore

    Luca Nickel committed Nov 19, 2021
    Configuration menu
    Copy the full SHA
    75edb77 View commit details
    Browse the repository at this point in the history

  2. Add GameScreenTest.java to include test directory (file contains no r… 

    …eal tests yet
    Luca Nickel committed Nov 19, 2021
    Configuration menu
    Copy the full SHA
    263d217 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #8 from 56luca/main 

    Delete text files and add test directory
    @eliasb1
    eliasb1 authored Nov 19, 2021
    Configuration menu
    Copy the full SHA
    eb0051f View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2021

  1. Create notification_text.txt 

    This file is to test the Discord notficiation when a new pull request is created.
    Luca authored Dec 2, 2021
    Configuration menu
    Copy the full SHA
    ca9788a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #9 from 56luca/main 

    Create notification_text.txt
    @eliasb1
    eliasb1 authored Dec 2, 2021
    Configuration menu
    Copy the full SHA
    8f95c69 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2021

  1. Add help menu

    @eliasb1
    eliasb1 committed Dec 9, 2021
    Configuration menu
    Copy the full SHA
    90fde26 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2021

  1. Merge pull request #10 from eliasb1/main 

    Add help screen
    @eliasb1
    eliasb1 authored Dec 13, 2021
    Configuration menu
    Copy the full SHA
    cb4c3dd View commit details
    Browse the repository at this point in the history

  2. Display settings and options for each setting

    @jfarinas96
    jfarinas96 committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    c2dab23 View commit details
    Browse the repository at this point in the history

  3. Change screen size

    @jfarinas96
    jfarinas96 committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    608afd2 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2021

  1. Adds setColor method to Entity class 

    Adds tests for setter and getter of Color for the Entity class
    Luca Nickel committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    fb556c1 View commit details
    Browse the repository at this point in the history

  2. Adds health, HEALTH_COLOR_CODE, getHealth() and reduceHealth() to the… 

    … EnemyShip class

Adds the corresponding tests for getHealth() and reduceHealth()
Adjusts the call of the EnemyShip constructor in EnemyShipFormation
    Luca Nickel committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    c80ffc9 View commit details
    Browse the repository at this point in the history

  3. Removes GameScreenTest (was only for testing purposes during the lab … 

    …session about testing)

Adjusts manageCollisions() in GameScreen to reduce the health of a hit ship and to only destroy it when health reached 0
    Luca Nickel committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    ed1d44f View commit details
    Browse the repository at this point in the history

  4. Added Music and sound effects

    @Josholeary
    Josholeary committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    1d888ee View commit details
    Browse the repository at this point in the history

  5. Fixed issue with music file pathnames

    @Josholeary
    Josholeary committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    e7bc143 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #11 from 56luca/main 

    Add health & color (depending on health)
    @eliasb1
    eliasb1 authored Dec 14, 2021
    Configuration menu
    Copy the full SHA
    3661c13 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #13 from Josholeary/main 

    Add Music and Sound Effects
    @eliasb1
    eliasb1 authored Dec 14, 2021
    Configuration menu
    Copy the full SHA
    de95961 View commit details
    Browse the repository at this point in the history

  8. Delete .vscode directory

    @eliasb1
    eliasb1 authored Dec 14, 2021
    Configuration menu
    Copy the full SHA
    dc7cc71 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2021

  1. Merge with upstream main

    @jfarinas96
    jfarinas96 committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    19c0d7a View commit details
    Browse the repository at this point in the history

  2. Add CI features using Maven

    @eliasb1
    eliasb1 authored Dec 15, 2021
    Configuration menu
    Copy the full SHA
    ea3cc3e View commit details
    Browse the repository at this point in the history

  3. Upgraded sound features

    @Josholeary
    Josholeary committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    b8b216e View commit details
    Browse the repository at this point in the history

  4. Merge pull request #14 from Josholeary/main 

    Upgraded sound features
    @eliasb1
    eliasb1 authored Dec 15, 2021
    Configuration menu
    Copy the full SHA
    b3179c1 View commit details
    Browse the repository at this point in the history

  5. Merge with upstream main

    @jfarinas96
    jfarinas96 committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    1a86f10 View commit details
    Browse the repository at this point in the history

  6. Testing volume control

    @jfarinas96
    jfarinas96 committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    c939f99 View commit details
    Browse the repository at this point in the history

  7. Add Maven configuration file

    @eliasb1
    eliasb1 committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    68c9dd6 View commit details
    Browse the repository at this point in the history

  8. Merge volume branch with main branch

    @jfarinas96
    jfarinas96 committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    2b29c9a View commit details
    Browse the repository at this point in the history

  9. Add volume feature

    @jfarinas96
    jfarinas96 committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    19c3393 View commit details
    Browse the repository at this point in the history

  10. Merge remote-tracking branch 'upstream/main'

    @jfarinas96
    jfarinas96 committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    607cab3 View commit details
    Browse the repository at this point in the history

  11. Delete old Maven configuration file

    @eliasb1
    eliasb1 committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    bd8a01b View commit details
    Browse the repository at this point in the history

  12. Create maven.yml

    @eliasb1
    eliasb1 authored Dec 15, 2021
    Configuration menu
    Copy the full SHA
    7c906b6 View commit details
    Browse the repository at this point in the history

  13. Update from upstream

    @jfarinas96
    jfarinas96 committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    90ab251 View commit details
    Browse the repository at this point in the history

  14. Fix Maven dependencies

    @eliasb1
    eliasb1 committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    9ca18c2 View commit details
    Browse the repository at this point in the history

  15. Merge volume with main

    @jfarinas96
    jfarinas96 committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    8bc13cd View commit details
    Browse the repository at this point in the history

  16. Delete old Maven configuration file

    @eliasb1
    eliasb1 committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    73283dc View commit details
    Browse the repository at this point in the history

  17. Create maven.yml

    @eliasb1
    eliasb1 authored Dec 15, 2021
    Configuration menu
    Copy the full SHA
    a8ca5e8 View commit details
    Browse the repository at this point in the history

  18. Fix JUnit version for Maven

    @eliasb1
    eliasb1 committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    435fe23 View commit details
    Browse the repository at this point in the history

  19. Add vibration effect when damage is taken [Sophie]

    @eliasb1
    eliasb1 committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    84bd627 View commit details
    Browse the repository at this point in the history

  20. Fix bgm music volume adjustment

    @jfarinas96
    jfarinas96 committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    7f56310 View commit details
    Browse the repository at this point in the history

  21. Adds JUnit dependency (forgot to commit with Display HP function)

    Luca Nickel committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    2c9ad7c View commit details
    Browse the repository at this point in the history

  22. Merge pull request #15 from 56luca/main 

    Add JUnit dependency
    @eliasb1
    eliasb1 authored Dec 15, 2021
    Configuration menu
    Copy the full SHA
    7f5c2f4 View commit details
    Browse the repository at this point in the history

  23. Preparing for difficulty settings option

    @jfarinas96
    jfarinas96 committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    13ce1f9 View commit details
    Browse the repository at this point in the history

  24. Merge remote-tracking branch 'upstream/main'

    @jfarinas96
    jfarinas96 committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    c60ad3d View commit details
    Browse the repository at this point in the history

  25. Add difficulty setting

    @jfarinas96
    jfarinas96 committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    bed4c21 View commit details
    Browse the repository at this point in the history

  26. Change EnemyShipTest.java file

    @jfarinas96
    jfarinas96 committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    b6882db View commit details
    Browse the repository at this point in the history

  27. Merge pull request #16 from jfarinas96/main 

    Add Settings feature
    @eliasb1
    eliasb1 authored Dec 15, 2021
    Configuration menu
    Copy the full SHA
    2b1163c View commit details
    Browse the repository at this point in the history

  28. Starting over to change the project structure

    @eliasb1
    eliasb1 committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    0424414 View commit details
    Browse the repository at this point in the history

  29. Update project structure to Maven project

    @eliasb1
    eliasb1 committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    006c690 View commit details
    Browse the repository at this point in the history

  30. Change project structure to a Maven project

    @eliasb1
    eliasb1 committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    5b661d8 View commit details
    Browse the repository at this point in the history

  31. Update Maven configuration file and add missing font

    @eliasb1
    eliasb1 committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    20ef604 View commit details
    Browse the repository at this point in the history

  32. Merge branch 'maven' into main

    @eliasb1
    eliasb1 authored Dec 15, 2021
    Configuration menu
    Copy the full SHA
    df29efd View commit details
    Browse the repository at this point in the history

  33. Merge pull request #17 from eliasb1/main 

    Update Maven configuration file and add missing font file
    @eliasb1
    eliasb1 authored Dec 15, 2021
    Configuration menu
    Copy the full SHA
    bce775f View commit details
    Browse the repository at this point in the history

  34. Update README file

    @eliasb1
    eliasb1 committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    8a319f7 View commit details
    Browse the repository at this point in the history

  35. Merge pull request #19 from eliasb1/main 

    Update README file
    @eliasb1
    eliasb1 authored Dec 15, 2021
    Configuration menu
    Copy the full SHA
    75cfcfe View commit details
    Browse the repository at this point in the history

  36. Update README file

    @eliasb1
    eliasb1 committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    3e843d3 View commit details
    Browse the repository at this point in the history

  37. Merge pull request #20 from eliasb1/main 

    Update README file
    @eliasb1
    eliasb1 authored Dec 15, 2021
    Configuration menu
    Copy the full SHA
    ebf327e View commit details
    Browse the repository at this point in the history