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

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

Conversation

jfarinas96
Copy link

Settings options:

  • Change screen size to Standard, Extended, or Default
  • Change difficulty to Easy, Medium, or Hard
  • Change volume to 25%, 50%, 75%, 100%, or Mute

Luca Nickel and others added 30 commits September 27, 2021 21:18
Add luca.txt to main branch
7fdc344
@eliasb1
Merge pull request #1 from 56luca/main
af0c07f 
Add luca.txt to main branch
@jfarinas96
Created janae.txt file
35c6433
@eliasb1
Merge pull request #2 from jfarinas96/testbranch
e5dd165 
Created janae.txt file
Change luca.txt in testBranch
937907c
@eliasb1
Merge pull request #3 from 56luca/testBranch
82c561d 
Change luca.txt in testBranch
@Josholeary
Adding practice file
f74ef37
@sibylle221
Added Sophie.txt
b7ee2d6
@eliasb1
Merge pull request #4 from Josholeary/main
15f7c06 
Adding practice file
@eliasb1
Merge pull request #5 from sibylle221/main
98cc497 
Added Sophie.txt
@Josholeary
Pause function added
d49ad32
@eliasb1
Merge pull request #6 from Josholeary/main
0f1ae1b 
Pause function added
@Josholeary
Added missing font file
9a464d8
@eliasb1
Merge pull request #7 from Josholeary/main
25f51b6 
Add missing font file
Delete txt files from git practice and update gitignore
75edb77
Add GameScreenTest.java to include test directory (file contains no r…
263d217 
…eal tests yet
@eliasb1
Merge pull request #8 from 56luca/main
eb0051f 
Delete text files and add test directory
Create notification_text.txt
ca9788a 
This file is to test the Discord notficiation when a new pull request is created.
@eliasb1
Merge pull request #9 from 56luca/main
8f95c69 
Create notification_text.txt
@eliasb1
Add help menu
90fde26
@eliasb1
Merge pull request #10 from eliasb1/main
cb4c3dd 
Add help screen
@jfarinas96
Display settings and options for each setting
c2dab23
@jfarinas96
Change screen size
608afd2
Adds setColor method to Entity class
fb556c1 
Adds tests for setter and getter of Color for the Entity class
Adds health, HEALTH_COLOR_CODE, getHealth() and reduceHealth() to the…
c80ffc9 
… EnemyShip class

Adds the corresponding tests for getHealth() and reduceHealth()
Adjusts the call of the EnemyShip constructor in EnemyShipFormation
Removes GameScreenTest (was only for testing purposes during the lab …
ed1d44f 
…session about testing)

Adjusts manageCollisions() in GameScreen to reduce the health of a hit ship and to only destroy it when health reached 0
@Josholeary
Added Music and sound effects
1d888ee
@Josholeary
Fixed issue with music file pathnames
e7bc143
@eliasb1
Merge pull request #11 from 56luca/main
3661c13 
Add health & color (depending on health)
@eliasb1
Merge pull request #13 from Josholeary/main
de95961 
Add Music and Sound Effects
jfarinas96 and others added 30 commits December 15, 2021 14:56
@jfarinas96
Merge volume branch with main branch
2b29c9a
@jfarinas96
Add volume feature
19c3393
@jfarinas96
Merge remote-tracking branch 'upstream/main'
607cab3
@eliasb1
Delete old Maven configuration file
bd8a01b
@eliasb1
Create maven.yml
7c906b6
@jfarinas96
Update from upstream
90ab251
@eliasb1
Fix Maven dependencies
9ca18c2
@jfarinas96
Merge volume with main
8bc13cd
@eliasb1
Delete old Maven configuration file
73283dc
@eliasb1
Create maven.yml
a8ca5e8
@eliasb1
Fix JUnit version for Maven
435fe23
@eliasb1
Add vibration effect when damage is taken [Sophie]
84bd627
@jfarinas96
Fix bgm music volume adjustment
7f56310
Adds JUnit dependency (forgot to commit with Display HP function)
2c9ad7c
@eliasb1
Merge pull request #15 from 56luca/main
7f5c2f4 
Add JUnit dependency
@jfarinas96
Preparing for difficulty settings option
13ce1f9
@jfarinas96
Merge remote-tracking branch 'upstream/main'
c60ad3d
@jfarinas96
Add difficulty setting
bed4c21
@jfarinas96
Change EnemyShipTest.java file
b6882db
@eliasb1
Merge pull request #16 from jfarinas96/main
2b1163c 
Add Settings feature
@eliasb1
Starting over to change the project structure
0424414
@eliasb1
Update project structure to Maven project
006c690
@eliasb1
Change project structure to a Maven project
5b661d8
@eliasb1
Update Maven configuration file and add missing font
20ef604
@eliasb1
Merge branch 'maven' into main
df29efd
@eliasb1
Merge pull request #17 from eliasb1/main
bce775f 
Update Maven configuration file and add missing font file
@eliasb1
Update README file
8a319f7
@eliasb1
Merge pull request #19 from eliasb1/main
75cfcfe 
Update README file
@eliasb1
Update README file
3e843d3
@eliasb1
Merge pull request #20 from eliasb1/main
ebf327e 
Update README file
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.
4 participants
@jfarinas96 @eliasb1 @Josholeary @sibylle221