Code

town demo merged with all the works#8

Code

Open

Cocodayow wants to merge 15 commits intopre-castle-updatesacmucsd-projects/su24-gamedev-team-2:pre-castle-updatesfrom town_demoacmucsd-projects/su24-gamedev-team-2:town_demoCopy head branch name to clipboard

+4,935-276

Commits

Commits on Aug 21, 2024

• merged katie's with dash

  Cocodayow

  committed
  6dc9c11

• merged katie's with dash and double jump

  Cocodayow

  committed
  86ce7bd

• Merge branch 'side_scroller_2' into merged_w_katie

  michellelyHuang728

  authored
  112fb37

• Merge pull request #2 from acmucsd-projects/merged_w_katie

  Show description for f2c3313
  michellelyHuang728

  authored
  f2c3313

• fixed merge issues

  Cocodayow

  committed
  d6ba8b4

• fixed merge issues

  Cocodayow

  committed
  65192cc

• update healthbar for skeleton and player

  michellelyHuang728

  committed
  1190054

Commits on Aug 22, 2024

• Merge pull request #3 from acmucsd-projects/health_bar

  Show description for e7e3db9
  michellelyHuang728

  authored
  e7e3db9

Commits on Aug 25, 2024

• updated a basic implementation of town

  Cocodayow

  committed
  b9a3624

Commits on Sep 15, 2024

• town updated with armor shop

  Cocodayow

  committed
  1e29794

Commits on Sep 22, 2024

• armor_shop_selection

  Cocodayow

  committed
  4d810bf

• armor_shop_buy

  Cocodayow

  committed
  7bba0bd

Commits on Oct 2, 2024

• armor_shop_withbg

  Cocodayow

  committed
  4e0184f

Commits on Oct 3, 2024

• potion shop done?

  Cocodayow

  committed
  70eb8a7

• potion shop done w updates

  Cocodayow

  committed
  fef8c1d