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

SCP-52 #78

Merged
merged 47 commits into from
Nov 30, 2021
Merged

SCP-52 #78

merged 47 commits into from
Nov 30, 2021

Conversation

LittleTealeaf
Copy link
Owner

God help our merge conflicts

LittleTealeaf and others added 30 commits November 23, 2021 17:01
@LittleTealeaf
Drafting up features for Test Case SCP-52
6309e47
@LittleTealeaf
Merge pull request #57 from LittleTealeaf/SCP-56
b6c638d 
Scp 56
@LittleTealeaf
Drafted Test Case SCP-52
76460b6 
Procedure might change as development unfolds.
@LittleTealeaf
Added Timer to top right of screen
16e6b3b
@LittleTealeaf
Formatted Timer to remove un-needed 0s at the front
8d80799
@LittleTealeaf
Reduced Next-Level wait time
7b55a4f
@LittleTealeaf
Added name field for each map
b566230
@LittleTealeaf
Started work on GameScoreScreen.java
1776743
@NicholasTourony
Created Test Case SCP-49
ff4f506
@NicholasTourony
Created the Difficulty Selection Menu
c998bb8
@LittleTealeaf
Merge pull request #62 from LittleTealeaf/SCP-56
464526b 
Update SCP-52 with changes in SCP-56
@LittleTealeaf
Game Timer now stops only when the player completes the last map
45d7887
@LittleTealeaf
Continued work on GameScoreScreen.java
225cf88
@LittleTealeaf
Set Default Value for SpriteFont.java
8125462
@LittleTealeaf
Merge pull request #63 from LittleTealeaf/SCP-56
300740b 
Update SCP-52 with SCP-56
@LittleTealeaf
Fixed rendering of time above a certain point
0402c1a
@LittleTealeaf
Merge remote-tracking branch 'origin/SCP-52' into SCP-52
ba3f2cc
@LittleTealeaf
Time now renders "1" minute instead of "01" minutes
fd0ccaa
@NicholasTourony
Added a difficulty holder that sets player health based on difficulty
bc59bb9
@NicholasTourony
Fixed the starting difficulty
7b7911e
@NicholasTourony
Hardcore mode restarts the user on the first level
8a90985
@LittleTealeaf
Merge branch 'SCP-52' into SCP-49
278abca
@LittleTealeaf
Merge pull request #72 from LittleTealeaf/SCP-49
df34460 
Scp 49
@LittleTealeaf
Final Screen now displays per-level times
226bdfa
@NicholasTourony
Enemy movement and projectile speed increases with difficulty
6e98819
@NicholasTourony
Selecting a difficulty returns the user to the main menu
aa288f4
@NicholasTourony
Updated Test Case SCP-49
af81349
@NicholasTourony
Updated Test Case SCP-49
45a38b7
@LittleTealeaf
Added Total Time to Score Screen
b81e482
@LittleTealeaf
Fixed Game Score Rendering
25d8893
LittleTealeaf and others added 17 commits November 30, 2021 13:06
@LittleTealeaf
Added Main-Menu option to GameScoreScreen.java
264baa4
@LittleTealeaf
Fixed Scaling issue with TimeTracker.java
a410fab
@LittleTealeaf
Merge branch 'main' into SCP-49
df55f59
@NicholasTourony
Fixed the overlapping Menu Screen
054d330
@LittleTealeaf
Moved Text placement in GameScoreSCreen.java
88b8611
@NicholasTourony
No longer utilizing the difficultyHolder class
e857c31
@NicholasTourony
Updated Test Case SCP-49
08ecb59
@LittleTealeaf
Passed Test Case SCP-49.md
74299c3
@LittleTealeaf
Merge pull request #76 from LittleTealeaf/SCP-49
511cda8 
Scp 49
@LittleTealeaf
Added Difficulty display to GameScoreScreen
56a2a70
@LittleTealeaf
Dying on hardcore resets timer
3c767a7
@LittleTealeaf
Fixed secondary timer displaying after resetting on hardcore mode
ea6981c
@LittleTealeaf
TimeTracker.java gets a new instance on hardcore reset
54c3e5f
@NicholasTourony
Passes Test Case SCP-52
ca94f59
@LittleTealeaf
Quick Cleanup of Comments
da6dd4d
@LittleTealeaf
Merge remote-tracking branch 'origin/SCP-52' into SCP-52
005943c
@LittleTealeaf
Merge branch 'main' into SCP-52
2f033b9
@LittleTealeaf LittleTealeaf merged commit 5669ae1 into main Nov 30, 2021
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.
2 participants
@LittleTealeaf @NicholasTourony