Alexander (!45) · Merge requests · Gard Aleksander Furre / Mr BigSock · GitLab

Snippets Groups Projects

Merged Alexander Gatland requested to merge alexander into main 2 years ago

Oct 27, 2022
- Merge branch 'main' into 'alexander' · b835a540
  Robin Ruud Kristensen authored 2 years ago
  
  # Conflicts: # MrBigsock/Assets/Code/InteractionSystem/Door.cs
  b835a540
- $DESKTOP-OVNO2Q1\alexa's avatar$
  
  Added chest content GUI · d4ccaada
  DESKTOP-OVNO2Q1\alexa authored 2 years ago
  
  d4ccaada
- Fixed it so items apper in their slots. · 31761dde
  Robin Halseth Sandvik authored 2 years ago
  
  31761dde
- Removed old print statements. · a643b3a0
  Robin Halseth Sandvik authored 2 years ago
  
  a643b3a0
- Made ItemPref use the icon of the item it represents. · c15f043b
  Robin Halseth Sandvik authored 2 years ago
  
  c15f043b
- Added definable icons to items. · 282095da
  Robin Halseth Sandvik authored 2 years ago
  
  282095da
- Just happened after pulling from main. · 3a8f2e22
  Robin Halseth Sandvik authored 2 years ago
  
  3a8f2e22
- Merge branch 'main' into 'master' · 5763ac5b
  Robin Halseth Sandvik authored 2 years ago
  
  Pushing new changes in main into master See merge request !41
  5763ac5b
- Added SpriteSerivice. · d6a7615a
  Robin Halseth Sandvik authored 2 years ago
  
  d6a7615a
- Added clone method for Skills. · a01bf45a
  Robin Halseth Sandvik authored 2 years ago
  
  a01bf45a