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

21 Sep, 2019 40 commits
- Merge branch 'develop' into feature/36-level-design · a1a9b8d8
  Kevin Balz authored Sep 21, 2019
  
  a1a9b8d8
- Merge branch 'feature/24-camera-screen-shake' into 'develop' · ed512969
  Tim Scheiber authored Sep 21, 2019
```
Resolve "Camera: Screen-Shake"

Closes #24

See merge request !29
```
  ed512969
- set goal correctly · 0502b5ca
  Kevin Balz authored Sep 21, 2019
  
  0502b5ca
- error fix · 11fead05
  Tim Scheiber authored Sep 21, 2019
  
  11fead05
- damn it windows · 57560692
  Kevin Balz authored Sep 21, 2019
  
  57560692
- Ok level · 776a7215
  Kevin Balz authored Sep 21, 2019
  
  776a7215
- external · 6a5d01e5
  Tim Scheiber authored Sep 21, 2019
  
  6a5d01e5
- update tileset · c9bd51ef
  Kevin Balz authored Sep 21, 2019
  
  c9bd51ef
- external · 715dcee8
  Tim Scheiber authored Sep 21, 2019
  
  715dcee8
- Merge branch 'develop' into feature/24-camera-screen-shake · 03da168c
  Tim Scheiber authored Sep 21, 2019
  
  03da168c
- error fix · 3d536398
  Tim Scheiber authored Sep 21, 2019
  
  3d536398
- Merge branch 'develop' of... · 5f103ca5
  Florian Oetke authored Sep 21, 2019
```
Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/cpp/phaseshifter into develop
```
  5f103ca5
- ui hud tweaks · a7c72dc0
  Florian Oetke authored Sep 21, 2019
  
  a7c72dc0
- screen shake - the game · 3c39a57c
  Tim Scheiber authored Sep 21, 2019
  
  3c39a57c
- Merge branch 'develop' into feature/36-level-design · 01450e18
  Kevin Balz authored Sep 21, 2019
  
  01450e18
- Merge branch 'develop' into feature/36-level-design · d6a13630
  Kevin Balz authored Sep 21, 2019
  
  d6a13630
- Säule, Ecke, plus Textures · c6a38211
  Lena Kerstin Lund authored Sep 21, 2019
  
  c6a38211
- more tweaks · dc99e616
  Kevin Balz authored Sep 21, 2019
  
  dc99e616
- scene lighting · 4b9f919b
  Florian Oetke authored Sep 21, 2019
  
  4b9f919b
- Merge branch 'develop' of... · ccb6e796
  Florian Oetke authored Sep 21, 2019
```
Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/cpp/phaseshifter into develop
```
  ccb6e796
- particle effect for special attack · 9c0eaad1
  Florian Oetke authored Sep 21, 2019
  
  9c0eaad1
- Merge branch 'feature/37-enemy-types' into feature/36-level-design · 48d8bdf1
  Kevin Balz authored Sep 21, 2019
  
  48d8bdf1
- more turrets · 89bede51
  Tim Scheiber authored Sep 21, 2019
  
  89bede51
- Merge branch '17-models' into 'develop' · 1aa7d115
  Georg Schaefer authored Sep 21, 2019
```
Resolve "Models"

Closes #17

See merge request !25
```
  1aa7d115
- Update supmodule mirrage. · f9240ce8
  Georg Schaefer authored Sep 21, 2019
  
  f9240ce8
- Merge branch 'develop' into 17-models · c0b70eeb
  Georg Schaefer authored Sep 21, 2019
  
  c0b70eeb
- Add character model with idle animation. · eb31559d
  Georg Schaefer authored Sep 21, 2019
  
  eb31559d
- Merge branch 'develop' of... · 5694995e
  Lena Kerstin Lund authored Sep 21, 2019
```
Merge branch 'develop' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/sommersemester-2019/cpp/phaseshifter into develop
```
  5694995e
- Dance Moves mit heilem Schwert · 5e1e1653
  Lena Kerstin Lund authored Sep 21, 2019
  
  5e1e1653
- Merge branch 'develop' of... · a6572e38
  Florian Oetke authored Sep 21, 2019
```
Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/cpp/phaseshifter into develop
```
  a6572e38
- fixed clang build (nullptr vs 0 in C-SPI) · f388c8fb
  Florian Oetke authored Sep 21, 2019
  
  f388c8fb
- pool for enemy-death particle systems [fixes #39 ] · fcd58402
  Florian Oetke authored Sep 21, 2019
  
  fcd58402
- Merge branch 'develop' into 17-models · cbb862b4
  Georg Schaefer authored Sep 21, 2019
  
  cbb862b4
- hübschere Animationen (Tanz kommt gleich) · ec6d4a54
  Lena Kerstin Lund authored Sep 21, 2019
  
  ec6d4a54
- Merge branch 'develop' into 17-models · 38b07519
  Georg Schaefer authored Sep 21, 2019
  
  38b07519
- Add new tiles. · e6543d74
  Georg Schaefer authored Sep 21, 2019
  
  e6543d74
- changed initial window settings to fullscreen at native resolution for release builds · 105b01ca
  Florian Oetke authored Sep 21, 2019
  
  105b01ca
- fixed input capture in game_screen · 8d9d7df3
  Florian Oetke authored Sep 21, 2019
  
  8d9d7df3
- Merge branch 'feature/37-enemy-types' into feature/36-level-design · 59b1cc9d
  Kevin Balz authored Sep 21, 2019
  
  59b1cc9d
- Merge branch 'develop' into feature/36-level-design · 21e4bf04
  Kevin Balz authored Sep 21, 2019
  
  21e4bf04