Code

Update SCP-47#70

Code

Merged

LittleTealeaf merged 64 commits intoSCP-47LittleTealeaf/SER-225-Team-A2:SCP-47from mainLittleTealeaf/SER-225-Team-A2:mainCopy head branch name to clipboardNov 29, 2021

+793-73

Commits

Commits on Nov 2, 2021

• Added Test Case SCP-44

  LittleTealeaf

  committed
  2caea7d

  Copy full SHA for 2caea7d

• Located Code

  LittleTealeaf

  committed
  fa553d7

  Copy full SHA for fa553d7

• Map bounds now dynamically scale with map size

  LittleTealeaf

  committed
  7cad0e5

  Copy full SHA for 7cad0e5

Commits on Nov 7, 2021

• Changed names for Test Cases SCP-1 - SCP-9 to the format SCP-01 - SCP-09

  LittleTealeaf

  committed
  f39ae5e

  Copy full SHA for f39ae5e

Commits on Nov 8, 2021

• Merge pull request #44 from LittleTealeaf/main

  Show description for 1332f7f
  LittleTealeaf

  authored
  1332f7f

  Copy full SHA for 1332f7f

• Fixed inability to complete a level

  

  Thomas

  authored and

  Thomas

  committed
  94f2a1c

  Copy full SHA for 94f2a1c

• Optimized Ordering of if statement

  LittleTealeaf

  committed
  ec61957

  Copy full SHA for ec61957

• Passed Test Case SCP-44

  NicholasTourony

  committed
  b0c8feb

  Copy full SHA for b0c8feb

• Merge pull request #43 from LittleTealeaf/SCP-44

  Show description for d49a8a0
  LittleTealeaf

  authored
  d49a8a0

  Copy full SHA for d49a8a0

• Merge pull request #45 from LittleTealeaf/SCP-50

  Show description for 97dca97
  LittleTealeaf

  authored
  97dca97

  Copy full SHA for 97dca97

Commits on Nov 9, 2021

• Added test case SCP-9

  jrconrad10

  committed
  f1eefb4

  Copy full SHA for f1eefb4

• Added test case SCP-9

  jrconrad10

  committed
  fda46ae

  Copy full SHA for fda46ae

• Added test case SCP-30

  jrconrad10

  committed
  5790139

  Copy full SHA for 5790139

• Created dog enemy and bone projectile to be used in Boss Battle Level

  jrconrad10

  committed
  7d8cbee

  Copy full SHA for 7d8cbee

• Created and added boss battle map to the game

  jrconrad10

  committed
  674ce0b

  Copy full SHA for 674ce0b

• Passed Test Case SCP-10

  LittleTealeaf

  committed
  0c6df35

  Copy full SHA for 0c6df35

• Merge pull request #48 from LittleTealeaf/SCP-10

  Show description for f6a8635
  LittleTealeaf

  authored
  f6a8635

  Copy full SHA for f6a8635

• Passed Test Case SCP-15

  LittleTealeaf

  committed
  6b8ee36

  Copy full SHA for 6b8ee36

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

  Show description for 5fb6749
  LittleTealeaf

  authored
  5fb6749

  Copy full SHA for 5fb6749

• Merge pull request #50 from LittleTealeaf/SCP-32

  Show description for c59a96b
  LittleTealeaf

  authored
  c59a96b

  Copy full SHA for c59a96b

Commits on Nov 10, 2021

• Added enemies and implemented boss battle features

  jrconrad10

  committed
  0a14c8f

  Copy full SHA for 0a14c8f

• Added a preview of the current cat in the options menu based on the current selected color

  jrconrad10

  committed
  23356dd

  Copy full SHA for 23356dd

• Passed Test Case SCP-30

  LittleTealeaf

  committed
  08a082e

  Copy full SHA for 08a082e

• Merge branch 'main' into SCP-30

  LittleTealeaf

  authored
  2481e67

  Copy full SHA for 2481e67

• Merge pull request #47 from LittleTealeaf/SCP-30

  Show description for be9c584
  LittleTealeaf

  authored
  be9c584

  Copy full SHA for be9c584

• Test Case SCP-9 in progress

  LittleTealeaf

  committed
  0d53500

  Copy full SHA for 0d53500

• Merge branch 'main' into SCP-9

  LittleTealeaf

  authored
  c2be534

  Copy full SHA for c2be534

• Renamed Test Case SCP-9 to Test Case SCP-09

  LittleTealeaf

  committed
  59eb405

  Copy full SHA for 59eb405

• Passed Test Case SCP-09

  LittleTealeaf

  committed
  509316e

  Copy full SHA for 509316e

• Merge pull request #46 from LittleTealeaf/SCP-9

  Show description for 01d22d8
  LittleTealeaf

  authored
  01d22d8

  Copy full SHA for 01d22d8

Commits on Nov 12, 2021

• Fixed Test Case ID

  LittleTealeaf

  authored
  f0c1c7c

  Copy full SHA for f0c1c7c

• Fixed Test Case ID for SCP-32

  LittleTealeaf

  authored
  3d5dc56

  Copy full SHA for 3d5dc56

Commits on Nov 16, 2021

• Created Test Case SCP-59

  LittleTealeaf

  committed
  b6321ba

  Copy full SHA for b6321ba

• Created test case SCP-55

  jrconrad10

  committed
  efaf7c2

  Copy full SHA for efaf7c2

• Created test case SCP-58

  jrconrad10

  committed
  d32d867

  Copy full SHA for d32d867

Commits on Nov 17, 2021

• Updated layout of LevelSelectScreen.java

  Show description for 315693a
  LittleTealeaf

  committed
  315693a

  Copy full SHA for 315693a

Commits on Nov 18, 2021

• Passed Test Case SCP-59

  NicholasTourony

  committed
  f2a7e0a

  Copy full SHA for f2a7e0a

• Merge pull request #54 from LittleTealeaf/SCP-59

  Show description for f11d7ed
  LittleTealeaf

  authored
  f11d7ed

  Copy full SHA for f11d7ed

Commits on Nov 26, 2021

• Fixed character preview in options menu to show the selected cat color

  jrconrad10

  committed
  20bbbe2

  Copy full SHA for 20bbbe2

• Fixed boss hitbox

  jrconrad10

  committed
  84f2244

  Copy full SHA for 84f2244

• Reset spawn location for boss battle

  jrconrad10

  committed
  2d11f2a

  Copy full SHA for 2d11f2a

Commits on Nov 28, 2021

• Created the floating platform and added it to some levels

  NicholasTourony

  committed
  514836a

  Copy full SHA for 514836a

Commits on Nov 29, 2021

• Passed Test Case SCP-62

  LittleTealeaf

  committed
  a50f9c3

  Copy full SHA for a50f9c3

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

  Show description for 69b55b2
  LittleTealeaf

  authored
  69b55b2

  Copy full SHA for 69b55b2

• Passed Test Case SCP-55

  LittleTealeaf

  committed
  77ecdbf

  Copy full SHA for 77ecdbf

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

  Show description for bd1b00c
  LittleTealeaf

  authored
  bd1b00c

  Copy full SHA for bd1b00c

• Passed Test Case SCP-58

  LittleTealeaf

  committed
  0b454fa

  Copy full SHA for 0b454fa

• Merge pull request #52 from LittleTealeaf/SCP-58

  Show description for 30db102
  LittleTealeaf

  authored
  30db102

  Copy full SHA for 30db102

• Added SCp-60 Test Cases and implemented bug fix

  hutch445

  committed
  66be104

  Copy full SHA for 66be104

• Added Test Cases and implemented Quit feature for SCP-51

  hutch445

  committed
  06e5de5

  Copy full SHA for 06e5de5

• Corrected Test Case Name and Objective

  hutch445

  committed
  41d3958

  Copy full SHA for 41d3958

• Corrected Test Name

  hutch445

  committed
  0e8afee

  Copy full SHA for 0e8afee

• Corrected exit status

  hutch445

  committed
  07e5cbc

  Copy full SHA for 07e5cbc

• Added Test Case and Sand Tile and implemented into game

  hutch445

  committed
  cb3eb5e

  Copy full SHA for cb3eb5e

• Passed Test Case SCP-60

  LittleTealeaf

  committed
  a4334c8

  Copy full SHA for a4334c8

• Merge pull request #66 from LittleTealeaf/SCP-60

  Show description for d98f6bc
  LittleTealeaf

  authored
  d98f6bc

  Copy full SHA for d98f6bc

• Passed Test Case SCP-51

  LittleTealeaf

  committed
  45e6a21

  Copy full SHA for 45e6a21

• Merge pull request #67 from LittleTealeaf/SCP-51

  Show description for 3a39e2d
  LittleTealeaf

  authored
  3a39e2d

  Copy full SHA for 3a39e2d

• Merging Main

  LittleTealeaf

  committed
  e566e0c

  Copy full SHA for e566e0c

• Merge pull request #68 from LittleTealeaf/main

  Show description for 7d2f901
  LittleTealeaf

  authored
  7d2f901

  Copy full SHA for 7d2f901

• Fixing Merge

  Show description for 7b012cb
  LittleTealeaf

  committed
  7b012cb

  Copy full SHA for 7b012cb

• Fixed Block ID in Map 1

  LittleTealeaf

  committed
  02ea089

  Copy full SHA for 02ea089

• Passed Test Case SCP-34

  LittleTealeaf

  committed
  36e0a03

  Copy full SHA for 36e0a03

• Merge pull request #69 from LittleTealeaf/SCP-34

  Show description for c2c551f
  LittleTealeaf

  authored
  c2c551f

  Copy full SHA for c2c551f