Made attacks damage the enemy. (!12) · Merge requests · Gard Aleksander Furre / Mr BigSock

Merged Robin Halseth Sandvik requested to merge master into main 2 years ago

Sep 25, 2022
- Fixed merge problems. · 0e92f38f
  Robin Halseth Sandvik authored 2 years ago
  
  0e92f38f
- Merge branch 'main' into 'master' · 2b52f253
  Robin Halseth Sandvik authored 2 years ago
  
  # Conflicts: # MrBigsock/Assets/Code/PlayerController.cs # MrBigsock/Assets/Code/orc/EnemyController.cs # MrBigsock/ProjectSettings/TagManager.asset
  2b52f253
- Added SlimeController and a slime prefab. · e7d05c47
  Robin Halseth Sandvik authored 2 years ago
  
  - Janky first version. - Animation not added, uses orc.
  e7d05c47
- Moved damage and death mechanics to Character. · d10654a6
  Robin Halseth Sandvik authored 2 years ago
  
  d10654a6
Sep 24, 2022

Made attacks damage the enemy. · fec9ee55

Robin Halseth Sandvik authored 2 years ago

- OnColide for projectiles.
- Layers to prevent collision between player and bullets.
- Commented out some unused print statements.
- Added hp handling to EnemyController.

fec9ee55

Made attacks damage the enemy.

Merge request reports

Activity