Commits · main · Håvard Fjørkenstad / Project Sprint

15 Dec, 2021 2 commits
- Merge branch 'Marcoip-main-patch-35504' into 'main' · e60e99cd
  Amund Helgestad authored Dec 15, 2021
```
Update RoomOrientationSelector.cs

See merge request haavarfj/project-sprint!100
```
  e60e99cd
- Update RoomOrientationSelector.cs · 908f4334
  Marco authored Dec 15, 2021
  
  908f4334
13 Dec, 2021 7 commits
- Merge branch 'Amund.Hel-main-patch-68873' into 'main' · 16927373
  Endre Heksum authored Dec 13, 2021
```
Updated the Readme to include more useful links and a Audio Settings guide

See merge request haavarfj/project-sprint!99
```
  16927373
- Updated the Readme to include more useful links and a Audio Settings guide · 1423791d
  Amund Helgestad authored Dec 13, 2021
  
  1423791d
- Merge branch 'Amund.Hel-main-patch-21431' into 'main' · 2ddbfae7
  Amund Helgestad authored Dec 13, 2021
```
Update gameprog.md

See merge request haavarfj/project-sprint!98
```
  2ddbfae7
- Update gameprog.md · 4e099b3f
  Amund Helgestad authored Dec 13, 2021
  
  4e099b3f
- Merge branch 'Amund.Hel-main-patch-00361' into 'main' · c0bdcaa7
  Amund Helgestad authored Dec 13, 2021
```
Added video links

See merge request haavarfj/project-sprint!97
```
  c0bdcaa7
- Added video links · bfd7a9bd
  Amund Helgestad authored Dec 13, 2021
  
  bfd7a9bd
- Merge branch 'johnobj-main-patch-79538' into 'main' · 2501307b
  Amund Helgestad authored Dec 13, 2021
```
Update gameprog.md

See merge request haavarfj/project-sprint!96
```
  2501307b
11 Dec, 2021 13 commits
- Update gameprog.md · 62be1180
  John Ole Bjerke authored Dec 11, 2021
  
  62be1180
- Merge branch 'Amund.Hel-main-patch-05900' into 'main' · 08359083
  Marco authored Dec 11, 2021
```
Update gameprog.md

See merge request haavarfj/project-sprint!95
```
  08359083
- Update gameprog.md · 384686af
  Amund Helgestad authored Dec 11, 2021
  
  384686af
- Merge branch 'Amund.Hel-main-patch-86223' into 'main' · 07b4473f
  John Ole Bjerke authored Dec 11, 2021
```
added the gameprog.md file

See merge request haavarfj/project-sprint!94
```
  07b4473f
- Merge branch 'haavarfj-main-patch-86641' into 'main' · 08f3728c
  Endre Heksum authored Dec 11, 2021
```
Update README.md

See merge request haavarfj/project-sprint!93
```
  08f3728c
- added the gameprog.md file · 2deac064
  Amund Helgestad authored Dec 11, 2021
  
  2deac064
- Merge branch 'haavarfj-main-patch-40693' into 'main' · 5473a72f
  Endre Heksum authored Dec 11, 2021
```
Update README.md

See merge request haavarfj/project-sprint!92
```
  5473a72f
- Update README.md · 58266324
  Håvard Fjørkenstad authored Dec 11, 2021
  
  58266324
- Update README.md · 8b9b5917
  Håvard Fjørkenstad authored Dec 11, 2021
  
  8b9b5917
- Merge branch 'haavarfj-main-patch-86548' into 'main' · b37cad40
  Marco authored Dec 11, 2021
```
Update README.md

See merge request haavarfj/project-sprint!91
```
  b37cad40
- Update README.md · fbeaddc1
  Håvard Fjørkenstad authored Dec 11, 2021
  
  fbeaddc1
- Merge branch 'Amund.Hel-main-patch-97684' into 'main' · dad59553
  Amund Helgestad authored Dec 11, 2021
```
Update README.md

See merge request haavarfj/project-sprint!90
```
  dad59553
- Update README.md · 91ef9e7d
  Amund Helgestad authored Dec 11, 2021
  
  91ef9e7d
30 Nov, 2021 18 commits
- Merge branch 'betaMain' into 'main' · 05858b72
  Amund Helgestad authored Nov 30, 2021
```
Beta main

See merge request haavarfj/project-sprint!89
```
  05858b72
- Merge branch 'itemgenfix' into 'betaMain' · c918cab4
  Amund Helgestad authored Nov 30, 2021
```
Fixed quit game bug that somehow came back with latest merge

See merge request haavarfj/project-sprint!88
```
  c918cab4
- Fixed quit game bug that somehow came back with latest merge · fd791b8c
  Astade authored Nov 30, 2021
  
  fd791b8c
- Merge branch 'betaMain' into 'main' · 0142f410
  Marco authored Nov 30, 2021
```
Fixed bug where some items, abilities and also their names, would not be...

See merge request haavarfj/project-sprint!87
```
  0142f410
- Merge branch 'itemgenfix' into 'betaMain' · e61fffe1
  Amund Helgestad authored Nov 30, 2021
```
Fixed bug where some items, abilities and also their names, would not be...

See merge request haavarfj/project-sprint!86
```
  e61fffe1
- Fixed bug where some items, abilities and also their names, would not be... · 981b0632
  Astade authored Nov 30, 2021
```
Fixed bug where some items, abilities and also their names, would not be generated or would be replaced by others.
```
  981b0632
- Merge branch 'betaMain' into 'main' · dd55bbf8
  Marco authored Nov 30, 2021
```
fixed quit function

See merge request haavarfj/project-sprint!85
```
  dd55bbf8
- fixed quit function · be336bab
  Marco authored Nov 30, 2021
  
  be336bab
- Merge branch 'betaMain' into 'main' · a76ad29f
  Amund Helgestad authored Nov 30, 2021
```
fix wirlwind thing

See merge request haavarfj/project-sprint!83
```
  a76ad29f
- Merge branch 'haavarfj-main-patch-12926' into 'main' · af94e79f
  Marco authored Nov 30, 2021
```
Update README.md

See merge request haavarfj/project-sprint!84
```
  af94e79f
- deleted build_ · 75584649
  Marco authored Nov 30, 2021
  
  75584649
- Update README.md · d63510b2
  Håvard Fjørkenstad authored Nov 30, 2021
  
  d63510b2
- fix wirlwind thing · 8052f0cd
  Marco authored Nov 30, 2021
  
  8052f0cd
- Merge branch 'betaMain' into 'main' · 85b63fe9
  Marco authored Nov 30, 2021
```
merge beta main into main

See merge request haavarfj/project-sprint!82
```
  85b63fe9
- Merge branch 'bossBugFixes' into 'betaMain' · a49ae371
  Amund Helgestad authored Nov 30, 2021
```
Did some bugfixes in Golem (health) and Necromancer boss (summon count), as...

See merge request haavarfj/project-sprint!81
```
  a49ae371
- Did some bugfixes in Golem (health) and Necromancer boss (summon count), as... · 5f699d93
  Astade authored Nov 30, 2021
```
Did some bugfixes in Golem (health) and Necromancer boss (summon count), as well as tweaking daggers a little
```
  5f699d93
- Merge branch 'amunFinal' into 'betaMain' · 1ee569ed
  Amund Helgestad authored Nov 30, 2021
```
Added music, vignette, an imp, and tweaked the lighting in main menu

As the title says, just added some music in main menu, an imp enemy that stays there like the character staticly with animation, tweaked lighting to use particle system for flickering, and added a vignette effect. Also tried to make harder difficulties harder by increasing monster stats on hard+ difficulties.

See merge request haavarfj/project-sprint!80
```
  1ee569ed
- Added music, vignette, an imp, and tweaked the lighting in main menu · 53c79480
  Astade authored Nov 30, 2021
  
  53c79480