Updating master to have the new stuff from main. (!21) · Merge requests · Gard Aleksander Furre / Mr BigSock

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

Sep 30, 2022
- Merge branch 'master' into 'main' · 75078db9
  Robin Halseth Sandvik authored 2 years ago
  
  New items system. See merge request !20
  75078db9
Sep 29, 2022
- Merge branch 'juliusfe-main-patch-89070' into 'main' · 5da4967e
  Julius Fredrik Einum authored 2 years ago
  
  Added todo to readme See merge request !19
  5da4967e
- Added todo to readme · 0b5f2a3b
  Julius Fredrik Einum authored 2 years ago
  
  0b5f2a3b
- Merge branch 'ruud' into 'main' · b19a413d
  Julius Fredrik Einum authored 2 years ago
  
  Ruud See merge request !11
  b19a413d
- Merge branch 'alexg' into 'main' · 7484915e
  Alexander Gatland authored 2 years ago
  
  Alexg See merge request !18
  7484915e
- $DESKTOP-OVNO2Q1\alexa's avatar$
  
  added opening animation to chest, and opening effect to door · 31c61a94
  DESKTOP-OVNO2Q1\alexa authored 2 years ago
  
  31c61a94
Sep 28, 2022
- $DESKTOP-OVNO2Q1\alexa's avatar$
  
  fixed so InteractionPoint is part of prefab · 961e16b1
  DESKTOP-OVNO2Q1\alexa authored 2 years ago
  
  961e16b1
- Merge branch 'alex' into 'main' · bf7c8131
  Alexander Gatland authored 2 years ago
  
  Added basic object interaction See merge request !17
  bf7c8131
- $DESKTOP-OVNO2Q1\alexa's avatar$
  
  Added basic object interaction · 68936e52
  DESKTOP-OVNO2Q1\alexa authored 2 years ago
  
  68936e52
Sep 27, 2022
- Merge branch 'master' into 'main' · a2668b01
  Robin Halseth Sandvik authored 2 years ago
  
  Updated the example scenario. See merge request !16
  a2668b01
- Merge branch 'master' into 'main' · 89b76a80
  Robin Halseth Sandvik authored 2 years ago
  
  Fixing knockback & movement. See merge request !15
  89b76a80
- Merge branch 'main' into 'ruud' · 19c54a2a
  Robin Ruud Kristensen authored 2 years ago
  
  # Conflicts: # MrBigsock/Assets/Prefabs/attack.prefab # MrBigsock/ProjectSettings/Physics2DSettings.asset # MrBigsock/ProjectSettings/TagManager.asset
  19c54a2a
Sep 23, 2022
- moved to enemy layer · 8bb217ab
  Robin Ruud Kristensen authored 2 years ago
  
  8bb217ab
- added enemies to scene · 5e3b0ca9
  Robin Ruud Kristensen authored 2 years ago
  
  5e3b0ca9
- added to physics to attack to pass through player and not enemies · e73ac4a7
  Robin Ruud Kristensen authored 2 years ago
  
  e73ac4a7
- added enemies · 31bbc860
  Robin Ruud Kristensen authored 2 years ago
  
  31bbc860
- 1 test level · c1e934dd
  Robin Ruud Kristensen authored 2 years ago
  
  c1e934dd
- script to follow player with points for camera to not move past · 1a6e5c27
  Robin Ruud Kristensen authored 2 years ago
  
  1a6e5c27

Updating master to have the new stuff from main.

Merge request reports

Activity