Code

Feature/colour shapes logic #9#18

Code

Merged

zsuh022 merged 8 commits intoSOFTENG310-G5:mainSOFTENG310-G5/BrainSomething:mainfrom nlia656:feature/colour-shapes-logicnlia656/BrainSomething:feature/colour-shapes-logicCopy head branch name to clipboardAug 20, 2024

+305,157-7

Commits

Commits on Aug 14, 2024

• created starter shapes and colour styles for shape colour game

  nlia656

  committed
  3deb1b8

  Copy full SHA for 3deb1b8

• added circle, square and rectangle to the shapes

  nlia656

  committed
  45be46d

  Copy full SHA for 45be46d

• added shape text and colour text to the puzzle cards

  nlia656

  committed
  9116466

  Copy full SHA for 9116466

Commits on Aug 15, 2024

• added numbers and number colour

  nlia656

  committed
  29fd086

  Copy full SHA for 29fd086

Commits on Aug 16, 2024

• completed colour cards styling and added colour codes

  nlia656

  committed
  9c38f80

  Copy full SHA for 9c38f80

• added answer input box

  nlia656

  committed
  a9c0792

  Copy full SHA for a9c0792

Commits on Aug 20, 2024

• added timed order cards

  nlia656

  committed
  fe43ffd

  Copy full SHA for fe43ffd

• Merge branch 'main' into feature/colour-shapes-logic

  nlia656

  authored
  2cf38c2

  Copy full SHA for 2cf38c2