Updating master (!52) · Merge requests · Gard Aleksander Furre / Mr BigSock · GitLab

Snippets Groups Projects

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

Oct 28, 2022
- Merge branch 'JuliusesNyeSuperBranch' into 'main' · 7a1d0f96
  Julius Fredrik Einum authored 2 years ago
  
  Juliuses nye super branch See merge request !51
  7a1d0f96
- don't know · 65123d4a
  Julius Fredrik Einum authored 2 years ago
  
  65123d4a
Oct 27, 2022
- Got Gen scene to work and added endscreen · b6760f2a
  Julius Fredrik Einum authored 2 years ago
  
  b6760f2a
- removed debug line · 80554f46
  Julius Fredrik Einum authored 2 years ago
  
  80554f46
- Merge branch 'main' into JuliusesNyeSuperBranch · 36335dd1
  Julius Fredrik Einum authored 2 years ago
  
  36335dd1
- Merge branch 'main' into JuliusesNyeSuperBranch · cfbcb99a
  Julius Fredrik Einum authored 2 years ago
  
  # Conflicts: # MrBigsock/Assets/Prefabs/Map.meta # MrBigsock/Assets/Scenes/GenTilemap.unity
  cfbcb99a
- Tweaked dodge · ab3affd8
  Julius Fredrik Einum authored 2 years ago
  
  ab3affd8
- Merge branch 'ruud1' into 'main' · cf92c016
  Robin Ruud Kristensen authored 2 years ago
  
  Ruud1 See merge request !50
  cf92c016
- Merge branch 'master' into JuliusesNyeSuperBranch · 6cdb5ae7
  Julius Fredrik Einum authored 2 years ago
  
  6cdb5ae7
- Added working tab system to inventory and added On press "i" to open inv · 5306df7c
  Julius Fredrik Einum authored 2 years ago
  
  5306df7c
- Merge branch 'main' of https://gitlab.stud.idi.ntnu.no/gardaf/mr-bigsock · e5b392dd
  Robin Ruud Kristensen authored 2 years ago
  
  e5b392dd
- teleports father away from wall · 7a58ebeb
  Robin Ruud Kristensen authored 2 years ago
  
  7a58ebeb
- Merge branch 'ruud1' into 'main' · d8ac551b
  Robin Ruud Kristensen authored 2 years ago
  
  Ruud1 See merge request !49
  d8ac551b
- fixed spawn area · e05dcfa2
  Robin Ruud Kristensen authored 2 years ago
  
  e05dcfa2
- added more enemies to randomily spawn · 83d847e9
  Robin Ruud Kristensen authored 2 years ago
  
  83d847e9
- added tag for enemies to check if room is cleared · 632ac86a
  Robin Ruud Kristensen authored 2 years ago
  
  632ac86a
- removed pad variable and from scene · d2d2bddd
  Robin Ruud Kristensen authored 2 years ago
  
  d2d2bddd
- removed unnecessary code and added comments · 71bd8680
  Robin Ruud Kristensen authored 2 years ago
  
  71bd8680
- Merge branch 'gardaf' into 'main' · 52d95a3f
  Gard Aleksander Furre authored 2 years ago
  
  added meta files See merge request !48
  52d95a3f
- added meta files · ccd9ddb3
  Gard Aleksander Furre authored 2 years ago
  
  ccd9ddb3
- Merge branch 'gardaf' into 'main' · 1bfe4854
  Gard Aleksander Furre authored 2 years ago
  
  Gardaf See merge request !46
  1bfe4854
- glømt en del filæ.... + addæ animasjon på big attack · 4e5ebba4
  Gard Aleksander Furre authored 2 years ago
  
  4e5ebba4
- Merge branch 'alexander' into 'main' · fb5529a1
  Alexander Gatland authored 2 years ago
  
  Alexander See merge request !45
  fb5529a1
- Merge branch 'main' into 'alexander' · b835a540
  Robin Ruud Kristensen authored 2 years ago
  
  # Conflicts: # MrBigsock/Assets/Code/InteractionSystem/Door.cs
  b835a540
- animation added to bigsock attack · ca0317f4
  Gard Aleksander Furre authored 2 years ago
  
  ca0317f4
- $DESKTOP-OVNO2Q1\alexa's avatar$
  
  Added chest content GUI · d4ccaada
  DESKTOP-OVNO2Q1\alexa authored 2 years ago
  
  d4ccaada
- fixed skeleton archer · a873272e
  Gard Aleksander Furre authored 2 years ago
  
  a873272e
- Merge branch 'main' into JuliusesNyeSuperBranch · 06e71546
  Julius Fredrik Einum authored 2 years ago
  
  06e71546
- Merge branch 'juliusfe-main-patch-89798' into 'main' · 8bb5ff3a
  Julius Fredrik Einum authored 2 years ago
  
  Update Submission See merge request !44
  8bb5ff3a
- Update Submission · d4312421
  Julius Fredrik Einum authored 2 years ago
  
  d4312421
- Merge branch 'juliusfe-main-patch-08524' into 'main' · f5aa7739
  Julius Fredrik Einum authored 2 years ago
  
  Add new file See merge request !43
  f5aa7739
- Add new file · 96e05a47
  Julius Fredrik Einum authored 2 years ago
  
  96e05a47
- Merge branch 'ruud' into 'main' · d51a6fea
  Julius Fredrik Einum authored 2 years ago
  
  Ruud See merge request !42
  d51a6fea
Oct 26, 2022
- Enemy spawns in each room, no check for door to be locked · 3cab2681
  Robin Ruud Kristensen authored 2 years ago
  
  3cab2681
- prefab for a single room in a level · 6c525d1e
  Robin Ruud Kristensen authored 2 years ago
  
  6c525d1e
- added so door can teleport player to new location · 526a4cb6
  Robin Ruud Kristensen authored 2 years ago
  
  526a4cb6
- cinemachine added to project · d65ecba0
  Robin Ruud Kristensen authored 2 years ago
  
  d65ecba0
- different param for room sizes · c58552d8
  Robin Ruud Kristensen authored 2 years ago
  
  c58552d8
- code to generate param files for size of rooms · c0eee794
  Robin Ruud Kristensen authored 2 years ago
  
  c0eee794
- Generator for tileset param files · 9cc5673c
  Robin Ruud Kristensen authored 2 years ago
  
  9cc5673c
- first stage with auto generation · 7f2b567e
  Robin Ruud Kristensen authored 2 years ago
  
  7f2b567e
- changed to interact with cinemachine · e468403c
  Robin Ruud Kristensen authored 2 years ago
  
  e468403c
- option to generate rooms in editor view · c7b5cc5b
  Robin Ruud Kristensen authored 2 years ago
  
  c7b5cc5b
- generate map on scene · 199450f1
  Robin Ruud Kristensen authored 2 years ago
  
  199450f1
- random generation · 7d0d4bf5
  Robin Ruud Kristensen authored 2 years ago
  
  7d0d4bf5