Commits · ac4d5d156cd05e91925921df8de2f36c24cb7e9b · GameDevWeek / Sommersemester 2019 / Cpp / PhaseShifter

19 Sep, 2019 24 commits
- basis for particle/ui/sound effects · ac4d5d15
  Florian Oetke authored Sep 19, 2019
  
  ac4d5d15
- Merge branch 'develop' of... · b25a522a
  Florian Oetke authored Sep 19, 2019
```
Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/cpp/phaseshifter into develop
```
  b25a522a
- fixed entity orientation in movement_system · 72530708
  Florian Oetke authored Sep 19, 2019
  
  72530708
- Merge branch 'feature/8-beat-detection' into 'develop' · 593e9372
  Kevin Balz authored Sep 19, 2019
```
Resolve "Beat-Detection"

Closes #8

See merge request !14
```
  593e9372
- static cast · 0bee058f
  Kevin Balz authored Sep 19, 2019
  
  0bee058f
- Update hud_system to detected beats · ccede621
  Kevin Balz authored Sep 19, 2019
  
  ccede621
- win condition · a8f92995
  Florian Oetke authored Sep 19, 2019
  
  a8f92995
- moved fbx files to /assets_raw · 8d29140a
  Florian Oetke authored Sep 19, 2019
  
  8d29140a
- Merge branch 'develop' of... · 557fbb07
  Florian Oetke authored Sep 19, 2019
```
Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/cpp/phaseshifter into develop
```
  557fbb07
- tweaked camera position and attached light source to camera · 2e68a646
  Florian Oetke authored Sep 19, 2019
  
  2e68a646
- Drone neu + Textures · 6974a7c9
  Lena Kerstin Lund authored Sep 19, 2019
  
  6974a7c9
- Merge branch 'develop' into feature/8-beat-detection · b70d11a4
  Kevin Balz authored Sep 19, 2019
  
  b70d11a4
- merge · 1296e68c
  Kevin Balz authored Sep 19, 2019
  
  1296e68c
- fixed another clang compiler error · f8a2378d
  Florian Oetke authored Sep 19, 2019
  
  f8a2378d
- fixed clang compiler error in movement_system.cpp · e7570b44
  Florian Oetke authored Sep 19, 2019
  
  e7570b44
- read beat file · e1a5942d
  Kevin Balz authored Sep 19, 2019
  
  e1a5942d
- reset mirrage submodule to latest commit · 0eb27437
  Florian Oetke authored Sep 19, 2019
  
  0eb27437
- Merge branch 'develop' of... · 332f6f33
  Florian Oetke authored Sep 19, 2019
```
Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/cpp/phaseshifter into develop
```
  332f6f33
- Merge branch 'develop' of... · 396e68d1
  Florian Oetke authored Sep 19, 2019
```
Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/cpp/phaseshifter into develop
```
  396e68d1
- Provisorische Animationen Character Run, Slash · f0f1f35b
  Lena Kerstin Lund authored Sep 19, 2019
  
  f0f1f35b
- level collisions · a662624c
  Florian Oetke authored Sep 19, 2019
  
  a662624c
- Character und Drohne (Gegner bewegend/schießend) · 37a05d0e
  Lena Kerstin Lund authored Sep 19, 2019
  
  37a05d0e
- fixed gameover condition · 71ef5ba0
  Florian Oetke authored Sep 19, 2019
  
  71ef5ba0
- fixed enemy movement · 72b82b73
  Florian Oetke authored Sep 19, 2019
  
  72b82b73
18 Sep, 2019 16 commits
- Merge branch 'feature/4-player-attack-directional' into 'develop' · c2a0f704
  Kevin Balz authored Sep 18, 2019
```
Resolve "Player Attack: Directional"

Closes #4

See merge request !11
```
  c2a0f704
- retweak back · 53aa2b65
  Kevin Balz authored Sep 18, 2019
  
  53aa2b65
- Dash · 06d11230
  Kevin Balz authored Sep 18, 2019
  
  06d11230
- Merge branch 'develop' of... · b51b5eb8
  Georg Schäfer authored Sep 18, 2019
```
Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/cpp/phaseshifter into develop
```
  b51b5eb8
- Add enemy spawner. · 0ca41c2d
  Georg Schäfer authored Sep 18, 2019
  
  0ca41c2d
- Merge branch 'develop' of... · 6ff0116c
  Florian Oetke authored Sep 18, 2019
```
Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/cpp/phaseshifter into develop
```
  6ff0116c
- tweaked ui beat indicator · c95e49c1
  Florian Oetke authored Sep 18, 2019
  
  c95e49c1
- Merge branch 'feature/22-level-collision-detection' into 'develop' · 82bd42e5
  Georg Schaefer authored Sep 18, 2019
```
Resolve "Level: Collision-Detection"

Closes #22

See merge request !7
```
  82bd42e5
- Include missing glm header. · d6ef9ae9
  Georg Schäfer authored Sep 18, 2019
  
  d6ef9ae9
- Include missing glm header. · 56877340
  Georg Schäfer authored Sep 18, 2019
  
  56877340
- Merge branch 'develop' into feature/22-level-collision-detection · a2e8d30b
  Georg Schäfer authored Sep 18, 2019
  
  a2e8d30b
- Add additional intersection tests. · 3043db13
  Georg Schäfer authored Sep 18, 2019
  
  3043db13
- rotate entities on movement · 57107559
  Florian Oetke authored Sep 18, 2019
  
  57107559
- Merge branch 'feature/3-smooth-movement' into 'develop' · daa74917
  Florian Oetke authored Sep 18, 2019
```
Resolve "Smooth Movement"

Closes #3

See merge request !8
```
  daa74917
- Merge remote-tracking branch 'origin/develop' into feature/3-smooth-movement · 458744f8
  Florian Oetke authored Sep 18, 2019
  
  458744f8
- smooth entity movement · 7fc5aa65
  Florian Oetke authored Sep 18, 2019
  
  7fc5aa65