Code

Pre-Merge#77

Code

Closed

LittleTealeaf wants to merge 95 commits intomainLittleTealeaf/SER-225-Team-A2:mainfrom SCP-52LittleTealeaf/SER-225-Team-A2:SCP-52Copy head branch name to clipboard

+1,355-240

Commits

Commits on Nov 16, 2021

• Created Test Case SCP-56

  Show description for ae9a60e
  LittleTealeaf

  committed
  ae9a60e

  Copy full SHA for ae9a60e

• Fix Typo in Test Case SCP-56

  LittleTealeaf

  committed
  b1547e6

  Copy full SHA for b1547e6

Commits on Nov 17, 2021

• Restructured how Test Case SCP-56 is executed

  LittleTealeaf

  committed
  d5ddd07

  Copy full SHA for d5ddd07

• Added Pass/Fail to individual tests

  LittleTealeaf

  committed
  8820dab

  Copy full SHA for 8820dab

• Modified headings of tests table to better format once data was inputted

  LittleTealeaf

  committed
  147a0d7

  Copy full SHA for 147a0d7

• Updated Test Case SCP-56

  Show description for abab678
  LittleTealeaf

  committed
  abab678

  Copy full SHA for abab678

• Added debug that displays the time (in ms) between frames

  LittleTealeaf

  committed
  216203b

  Copy full SHA for 216203b

• Added Measurement for Cat Sprinting

  LittleTealeaf

  committed
  10f17bc

  Copy full SHA for 10f17bc

• Added code to fetch the highest refresh rate

  LittleTealeaf

  committed
  ad37857

  Copy full SHA for ad37857

• Created GameTick.java, which uses Threads to send updates rather than Timers

  LittleTealeaf

  committed
  4a4503b

  Copy full SHA for 4a4503b

• Assigned runnable variable

  LittleTealeaf

  committed
  2cd8654

  Copy full SHA for 2cd8654

Commits on Nov 19, 2021

• Game indeed runs different on different computers

  Show description for 633f62f
  LittleTealeaf

  committed
  633f62f

  Copy full SHA for 633f62f

• It was at this moment, he knew

  Show description for 8174efc
  LittleTealeaf

  committed
  8174efc

  Copy full SHA for 8174efc

• Added Scaler to GameThread.java

  LittleTealeaf

  committed
  3af25e5

  Copy full SHA for 3af25e5

• Merge pull request #55 from LittleTealeaf/SCP-57

  Show description for 10f8706
  LittleTealeaf

  authored
  10f8706

  Copy full SHA for 10f8706

• Player moves?

  LittleTealeaf

  committed
  2677d4d

  Copy full SHA for 2677d4d

• Player finishing the level now correctly works

  LittleTealeaf

  committed
  266ce4b

  Copy full SHA for 266ce4b

• Player successfully moves at the same speed on different computers

  LittleTealeaf

  committed
  731623c

  Copy full SHA for 731623c

• Changed to Single Thread

  LittleTealeaf

  committed
  24a8008

  Copy full SHA for 24a8008

• Game breaks when tick delay is set to 5

  LittleTealeaf

  committed
  b6e281e

  Copy full SHA for b6e281e

• Deprecated RenderThread for now

  LittleTealeaf

  committed
  fb2c48d

  Copy full SHA for fb2c48d

• Changed Tick Delay to 1

  LittleTealeaf

  committed
  69bd9d9

  Copy full SHA for 69bd9d9

• Located code responsible for causing animation errors

  LittleTealeaf

  committed
  5f2989d

  Copy full SHA for 5f2989d

• I've decided I may rewrite a few classes

  Show description for 54d9431
  LittleTealeaf

  committed
  54d9431

  Copy full SHA for 54d9431

• Added list of ideas needed for task

  LittleTealeaf

  committed
  b603a4f

  Copy full SHA for b603a4f

• Removed Thread Variable

  LittleTealeaf

  committed
  c605f87

  Copy full SHA for c605f87

• Commenting / Parsing out Collision Detection

  LittleTealeaf

  committed
  2aab7bd

  Copy full SHA for 2aab7bd

• Created Vector.java to hold vectors

  LittleTealeaf

  committed
  fe090ee

  Copy full SHA for fe090ee

Commits on Nov 20, 2021

• Implemented Vectors, started work on Collision Handling

  LittleTealeaf

  committed
  6a605c5

  Copy full SHA for 6a605c5

Commits on Nov 21, 2021

• Collision Handling will be handled in GameObject.java

  LittleTealeaf

  committed
  b175ff8

  Copy full SHA for b175ff8

• New Collisions actually detect if a collision occurred.

  LittleTealeaf

  committed
  f3b4af3

  Copy full SHA for f3b4af3

• Added EnhancedMapTiles to the collision check

  LittleTealeaf

  committed
  b14be3c

  Copy full SHA for b14be3c

• Collisions work... not!

  LittleTealeaf

  committed
  487e039

  Copy full SHA for 487e039

Commits on Nov 22, 2021

• Player now skips first 2 move updates

  Show description for 1e668ba
  LittleTealeaf

  committed
  1e668ba

  Copy full SHA for 1e668ba

• Re-built Game Thread

  LittleTealeaf

  committed
  95cd0a5

  Copy full SHA for 95cd0a5

• Cat hits the ground! Kindof

  LittleTealeaf

  committed
  05f7b56

  Copy full SHA for 05f7b56

• Back to the drawing board

  LittleTealeaf

  committed
  a59c96e

  Copy full SHA for a59c96e

• Vector Physics should work

  Show description for 1b6c450
  LittleTealeaf

  committed
  1b6c450

  Copy full SHA for 1b6c450

• Added method in Map to get mapTiles

  Show description for 3031dc2
  LittleTealeaf

  committed
  3031dc2

  Copy full SHA for 3031dc2

• Add in inAir calculations

  LittleTealeaf

  committed
  a9da456

  Copy full SHA for a9da456

Commits on Nov 23, 2021

• Deprecated RectangleOld.java, created new Rectangle.java

  LittleTealeaf

  committed
  d4f6c8d

  Copy full SHA for d4f6c8d

• Converted use to new Rectangle.java

  Show description for 58e78eb
  LittleTealeaf

  committed
  58e78eb

  Copy full SHA for 58e78eb

• Switched back to iterative algorithm

  LittleTealeaf

  committed
  5ba8964

  Copy full SHA for 5ba8964

• So collision detection works...

  LittleTealeaf

  committed
  cf55e97

  Copy full SHA for cf55e97

• Cleaning up Entity Bounds

  LittleTealeaf

  committed
  cc9d180

  Copy full SHA for cc9d180

• Fixed scaled bounds originating at (0,0)

  LittleTealeaf

  committed
  68867f5

  Copy full SHA for 68867f5

• Revert back / implement fix for task

  LittleTealeaf

  committed
  6f8b741

  Copy full SHA for 6f8b741

• Clean-up

  LittleTealeaf

  committed
  9fa3832

  Copy full SHA for 9fa3832

• Additional Cleanup

  LittleTealeaf

  committed
  9980858

  Copy full SHA for 9980858

• Merge pull request #56 from LittleTealeaf/main

  Show description for 9c16ac7
  LittleTealeaf

  authored
  9c16ac7

  Copy full SHA for 9c16ac7

• Drafting up features for Test Case SCP-52

  LittleTealeaf

  committed
  6309e47

  Copy full SHA for 6309e47

• Merge pull request #57 from LittleTealeaf/SCP-56

  Show description for b6c638d
  LittleTealeaf

  authored
  b6c638d

  Copy full SHA for b6c638d

Commits on Nov 24, 2021

• Drafted Test Case SCP-52

  Show description for 76460b6
  LittleTealeaf

  committed
  76460b6

  Copy full SHA for 76460b6

• Added Timer to top right of screen

  LittleTealeaf

  committed
  16e6b3b

  Copy full SHA for 16e6b3b

• Formatted Timer to remove un-needed 0s at the front

  LittleTealeaf

  committed
  8d80799

  Copy full SHA for 8d80799

• Reduced Next-Level wait time

  LittleTealeaf

  committed
  7b55a4f

  Copy full SHA for 7b55a4f

Commits on Nov 27, 2021

• Added name field for each map

  LittleTealeaf

  committed
  b566230

  Copy full SHA for b566230

• Started work on GameScoreScreen.java

  LittleTealeaf

  committed
  1776743

  Copy full SHA for 1776743

Commits on Nov 29, 2021

• Created Test Case SCP-49

  NicholasTourony

  committed
  ff4f506

  Copy full SHA for ff4f506

• Created the Difficulty Selection Menu

  NicholasTourony

  committed
  c998bb8

  Copy full SHA for c998bb8

• Merge pull request #60 from LittleTealeaf/main

  Show description for 1ad7a1f
  LittleTealeaf

  authored
  1ad7a1f

  Copy full SHA for 1ad7a1f

• Moved Rendering to happen immediately after any update

  Show description for f5dc589
  LittleTealeaf

  committed
  f5dc589

  Copy full SHA for f5dc589

• Added Laptop Measurements to Test Case SCP-56

  LittleTealeaf

  committed
  48b82b8

  Copy full SHA for 48b82b8

• Added Prerequisite for Test Case SCP-56

  LittleTealeaf

  committed
  7d11412

  Copy full SHA for 7d11412

• Added Prerequisite for Test Case SCP-57

  LittleTealeaf

  committed
  4617d3a

  Copy full SHA for 4617d3a

• Merge pull request #62 from LittleTealeaf/SCP-56

  Show description for 464526b
  LittleTealeaf

  authored
  464526b

  Copy full SHA for 464526b

• Game Timer now stops only when the player completes the last map

  LittleTealeaf

  committed
  45d7887

  Copy full SHA for 45d7887

• Continued work on GameScoreScreen.java

  LittleTealeaf

  committed
  225cf88

  Copy full SHA for 225cf88

• Set Default Value for SpriteFont.java

  LittleTealeaf

  committed
  8125462

  Copy full SHA for 8125462

• Game no longer renders while behind on ticks

  Show description for 763f20e
  LittleTealeaf

  committed
  763f20e

  Copy full SHA for 763f20e

• Merge pull request #63 from LittleTealeaf/SCP-56

  Show description for 300740b
  LittleTealeaf

  authored
  300740b

  Copy full SHA for 300740b

• Fixed rendering of time above a certain point

  LittleTealeaf

  committed
  0402c1a

  Copy full SHA for 0402c1a

• Merge remote-tracking branch 'origin/SCP-52' into SCP-52

  LittleTealeaf

  committed
  ba3f2cc

  Copy full SHA for ba3f2cc

• Time now renders "1" minute instead of "01" minutes

  LittleTealeaf

  committed
  fd0ccaa

  Copy full SHA for fd0ccaa

• Added a difficulty holder that sets player health based on difficulty

  NicholasTourony

  committed
  bc59bb9

  Copy full SHA for bc59bb9

• Fixed the starting difficulty

  NicholasTourony

  committed
  7b7911e

  Copy full SHA for 7b7911e

• Hardcore mode restarts the user on the first level

  NicholasTourony

  committed
  8a90985

  Copy full SHA for 8a90985

• Merge branch 'SCP-52' into SCP-49

  LittleTealeaf

  authored
  278abca

  Copy full SHA for 278abca

• Merge pull request #72 from LittleTealeaf/SCP-49

  Show description for df34460
  LittleTealeaf

  authored
  df34460

  Copy full SHA for df34460

Commits on Nov 30, 2021

• Final Screen now displays per-level times

  LittleTealeaf

  committed
  226bdfa

  Copy full SHA for 226bdfa

• Enemy movement and projectile speed increases with difficulty

  NicholasTourony

  committed
  6e98819

  Copy full SHA for 6e98819

• Selecting a difficulty returns the user to the main menu

  NicholasTourony

  committed
  aa288f4

  Copy full SHA for aa288f4

• Updated Test Case SCP-49

  NicholasTourony

  committed
  af81349

  Copy full SHA for af81349

• Updated Test Case SCP-49

  NicholasTourony

  committed
  45a38b7

  Copy full SHA for 45a38b7

• Added Total Time to Score Screen

  LittleTealeaf

  committed
  b81e482

  Copy full SHA for b81e482

• Fixed Game Score Rendering

  LittleTealeaf

  committed
  25d8893

  Copy full SHA for 25d8893

• Added Main-Menu option to GameScoreScreen.java

  LittleTealeaf

  committed
  264baa4

  Copy full SHA for 264baa4

• Fixed Scaling issue with TimeTracker.java

  LittleTealeaf

  committed
  a410fab

  Copy full SHA for a410fab

• Merge branch 'main' into SCP-49

  LittleTealeaf

  authored
  df55f59

  Copy full SHA for df55f59

• Fixed the overlapping Menu Screen

  NicholasTourony

  committed
  054d330

  Copy full SHA for 054d330

• Moved Text placement in GameScoreSCreen.java

  LittleTealeaf

  committed
  88b8611

  Copy full SHA for 88b8611

• No longer utilizing the difficultyHolder class

  NicholasTourony

  committed
  e857c31

  Copy full SHA for e857c31

• Updated Test Case SCP-49

  NicholasTourony

  committed
  08ecb59

  Copy full SHA for 08ecb59

• Passed Test Case SCP-49.md

  LittleTealeaf

  committed
  74299c3

  Copy full SHA for 74299c3

• Merge pull request #76 from LittleTealeaf/SCP-49

  Show description for 511cda8
  LittleTealeaf

  authored
  511cda8

  Copy full SHA for 511cda8