Commits · 0d1ac080934fe475428ee008f3adab89a80f8170 · Gard Aleksander Furre / Mr BigSock

Nov 18, 2022
- Merge branch 'main' into JuliusesNyeSuperBranch · 0d1ac080
  Julius Fredrik Einum authored 2 years ago
  
  0d1ac080
- Fixed working version of game with sounds, build and exit · 0e2b6565
  Julius Fredrik Einum authored 2 years ago
  
  0e2b6565
Nov 10, 2022

Merge remote-tracking branch 'origin/ruud1' into JuliusesNyeSuperBranch · d8533d89
Julius Fredrik Einum authored 2 years ago

d8533d89
added more health · fc2ab1f6
Robin Ruud Kristensen authored 2 years ago

fc2ab1f6
something · b40c0b15
Robin Ruud Kristensen authored 2 years ago

b40c0b15
something · 3aa80cad
Robin Ruud Kristensen authored 2 years ago

3aa80cad
added onDestroy · cb8609eb
Robin Ruud Kristensen authored 2 years ago

cb8609eb
edited health of boss · 9bb76b09
Robin Ruud Kristensen authored 2 years ago

9bb76b09
faster attack · 63f0d744
Robin Ruud Kristensen authored 2 years ago

63f0d744
added destroying lists · bffc6b11
Robin Ruud Kristensen authored 2 years ago

bffc6b11
Merge branch 'JuliusesNyeSuperBranch' into 'main' · 2d2355b0
Julius Fredrik Einum authored 2 years ago
```
Juliuses nye super branch

See merge request !74
```
2d2355b0
added clear map functions · 758cc2b8
Robin Ruud Kristensen authored 2 years ago

758cc2b8
Meta creation - and build "works" · 3c34eed9
Julius Fredrik Einum authored 2 years ago

3c34eed9
fixed wrong else if statement · 039f77e5
Robin Ruud Kristensen authored 2 years ago

039f77e5
scene with colliders · 1c08e23d
Robin Ruud Kristensen authored 2 years ago

1c08e23d

Merge branch 'master' into JuliusesNyeSuperBranch · 19e3a9af

Julius Fredrik Einum authored 2 years ago

# Conflicts:
#	MrBigsock/Assets/Prefabs/MapObjects/Canvas.controller
#	MrBigsock/Assets/Prefabs/MapObjects/Canvas.controller.meta
#	MrBigsock/Assets/Prefabs/MapObjects/ClosedChest.controller
#	MrBigsock/Assets/Prefabs/MapObjects/ClosedChest.controller.meta
#	MrBigsock/Assets/Prefabs/MapObjects/ClosedChest.prefab
#	MrBigsock/Assets/Prefabs/MapObjects/ClosedChest.prefab.meta
#	MrBigsock/Assets/Prefabs/MapObjects/ClosedDoor.controller
#	MrBigsock/Assets/Prefabs/MapObjects/ClosedDoor.controller.meta
#	MrBigsock/Assets/Prefabs/MapObjects/ClosedDoor.prefab
#	MrBigsock/Assets/Prefabs/MapObjects/ClosedDoor.prefab.meta
#	MrBigsock/Assets/Prefabs/MapObjects/OpenDoor.prefab
#	MrBigsock/Assets/Prefabs/MapObjects/OpenDoor.prefab.meta
#	MrBigsock/Assets/Prefabs/MapObjects/OpeningGoldChest.anim
#	MrBigsock/Assets/Prefabs/MapObjects/OpeningGoldChest.anim.meta
#	MrBigsock/Assets/Resources/Sprites/Enemy/Boss/Sprites/Bringer_of_death/Individual Sprite/Attack/coffee.png
#	MrBigsock/Assets/Resources/Sprites/Enemy/Boss/Sprites/Bringer_of_death/Individual Sprite/Attack/coffee.png.meta
#	MrBigsock/Assets/Resources/Sprites/Enemy/Boss/Sprites/Bringer_of_death/Individual Sprite/Attack/elixirofspeed.png
#	MrBigsock/Assets/Resources/Sprites/Enemy/Boss/Sprites/Bringer_of_death/Individual Sprite/Attack/elixirofspeed.png.meta
#	MrBigsock/Assets/Resources/Sprites/Enemy/Boss/Sprites/Bringer_of_death/Individual Sprite/Attack/foureyes.png
#	MrBigsock/Assets/Resources/Sprites/Enemy/Boss/Sprites/Bringer_of_death/Individual Sprite/Attack/foureyes.png.meta
#	MrBigsock/Assets/Resources/Sprites/Enemy/Boss/Sprites/Bringer_of_death/Individual Sprite/Attack/lunch.png
#	MrBigsock/Assets/Resources/Sprites/Enemy/Boss/Sprites/Bringer_of_death/Individual Sprite/Attack/lunch.png.meta
#	MrBigsock/Assets/Resources/Sprites/Enemy/Boss/Sprites/Bringer_of_death/Individual Sprite/Attack/plasticstraw.png
#	MrBigsock/Assets/Resources/Sprites/Enemy/Boss/Sprites/Bringer_of_death/Individual Sprite/Attack/plasticstraw.png.meta
#	MrBigsock/Assets/Resources/Sprites/Enemy/Boss/Sprites/Bringer_of_death/Individual Sprite/Attack/premature.png
#	MrBigsock/Assets/Resources/Sprites/Enemy/Boss/Sprites/Bringer_of_death/Individual Sprite/Attack/premature.png.meta
#	MrBigsock/Assets/Resources/Sprites/Enemy/Boss/Sprites/Bringer_of_death/Individual Sprite/Attack/runningshoes.png
#	MrBigsock/Assets/Resources/Sprites/Enemy/Boss/Sprites/Bringer_of_death/Individual Sprite/Attack/runningshoes.png.meta
#	MrBigsock/Assets/Resources/Sprites/Item/Canvas.controller
#	MrBigsock/Assets/Resources/Sprites/Item/Canvas.controller.meta
#	MrBigsock/Assets/Resources/Sprites/Item/ClosedChest.controller
#	MrBigsock/Assets/Resources/Sprites/Item/ClosedChest.controller.meta
#	MrBigsock/Assets/Resources/Sprites/Item/ClosedChest.prefab
#	MrBigsock/Assets/Resources/Sprites/Item/ClosedChest.prefab.meta
#	MrBigsock/Assets/Resources/Sprites/Item/ClosedDoor.controller
#	MrBigsock/Assets/Resources/Sprites/Item/ClosedDoor.controller.meta
#	MrBigsock/Assets/Resources/Sprites/Item/ClosedDoor.prefab
#	MrBigsock/Assets/Resources/Sprites/Item/ClosedDoor.prefab.meta
#	MrBigsock/Assets/Resources/Sprites/Item/OpenDoor.prefab
#	MrBigsock/Assets/Resources/Sprites/Item/OpenDoor.prefab.meta
#	MrBigsock/Assets/Resources/Sprites/Item/OpeningGoldChest.anim
#	MrBigsock/Assets/Resources/Sprites/Item/OpeningGoldChest.anim.meta
#	MrBigsock/Assets/Sprites/Item/Canvas.controller
#	MrBigsock/Assets/Sprites/Item/Canvas.controller.meta
#	MrBigsock/Assets/Sprites/Item/ClosedChest.controller
#	MrBigsock/Assets/Sprites/Item/ClosedChest.controller.meta
#	MrBigsock/Assets/Sprites/Item/ClosedChest.prefab
#	MrBigsock/Assets/Sprites/Item/ClosedChest.prefab.meta
#	MrBigsock/Assets/Sprites/Item/ClosedDoor.controller
#	MrBigsock/Assets/Sprites/Item/ClosedDoor.controller.meta
#	MrBigsock/Assets/Sprites/Item/ClosedDoor.prefab
#	MrBigsock/Assets/Sprites/Item/ClosedDoor.prefab.meta
#	MrBigsock/Assets/Sprites/Item/OpenDoor.prefab
#	MrBigsock/Assets/Sprites/Item/OpenDoor.prefab.meta
#	MrBigsock/Assets/Sprites/Item/OpeningGoldChest.anim
#	MrBigsock/Assets/Sprites/Item/OpeningGoldChest.anim.meta

19e3a9af

Merge branch 'main' into JuliusesNyeSuperBranch · 0554777c
Julius Fredrik Einum authored 2 years ago

0554777c
Changes to logic · e48ea081
Julius Fredrik Einum authored 2 years ago

e48ea081
Fix for build. · 18aa9a2c
Robin Halseth Sandvik authored 2 years ago

18aa9a2c
Merge branch 'alexander' into 'main' · 3db912b0
Alexander Gatland authored 2 years ago
```
Added icons to all items

See merge request !72
```
3db912b0
Merge branch 'main' of https://gitlab.stud.idi.ntnu.no/gardaf/mr-bigsock · 85a87bc6
Robin Ruud Kristensen authored 2 years ago

85a87bc6
Merge branch 'JuliusesNyeSuperBranch' into 'main' · b91c8fc1
Julius Fredrik Einum authored 2 years ago
```
Juliuses nye super branch

See merge request !71
```
b91c8fc1
Small logic changes and cleaning · 4a39c430
Julius Fredrik Einum authored 2 years ago

4a39c430
$DESKTOP-OVNO2Q1\alexa's avatar$

Added icons to all items · 089abda7
DESKTOP-OVNO2Q1\alexa authored 2 years ago

089abda7
Merge branch 'gardaf' into 'main' · ad2df337
Gard Aleksander Furre authored 2 years ago
```
added enemy hp bar to sceen

See merge request !70
```
ad2df337
added enemy hp bar to sceen · 9010a1fb
Gard Aleksander Furre authored 2 years ago

9010a1fb
Merge branch 'main' into JuliusesNyeSuperBranch · 2faedcfd
Julius Fredrik Einum authored 2 years ago

2faedcfd
Merme main into Julius branch · faf906c4
Julius Fredrik Einum authored 2 years ago

faf906c4
Merge branch 'gardaf' into 'main' · 4e7eebca
Gard Aleksander Furre authored 2 years ago
```
hp bar til sist enemy som tok dmg

See merge request !69
```
4e7eebca
hp bar til sist enemy som tok dmg · c4f00624
Gard Aleksander Furre authored 2 years ago

c4f00624
Added ControlScheme screen and end screen · 226104ed
Julius Fredrik Einum authored 2 years ago

226104ed
added background music gameobject to scene · a5bb1d88
Robin Ruud Kristensen authored 2 years ago

a5bb1d88
Merge branch 'main' of https://gitlab.stud.idi.ntnu.no/gardaf/mr-bigsock · f8c17a33
Robin Ruud Kristensen authored 2 years ago

f8c17a33
changed size for boss room · 6ef954f1
Robin Ruud Kristensen authored 2 years ago

6ef954f1
changed room size · dfe73166
Robin Ruud Kristensen authored 2 years ago

dfe73166
added tag for boss · f5c365f5
Robin Ruud Kristensen authored 2 years ago

f5c365f5
Merge branch 'master' into 'main' · 5ff7b55d
Robin Halseth Sandvik authored 2 years ago
```
Master

See merge request !68
```
5ff7b55d
Fixed extreme knockback. · cb6c98aa
Robin Halseth Sandvik authored 2 years ago

cb6c98aa
Changed dodge to left shift. · 1d0d8afd
Robin Halseth Sandvik authored 2 years ago

1d0d8afd
maybe fixed spawning of enemies · c527188a
Robin Ruud Kristensen authored 2 years ago

c527188a