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

22 Sep, 2019 1 commit
- probably final tweaks · b5680761
  Kevin Balz authored Sep 22, 2019
  
  b5680761
21 Sep, 2019 39 commits
- Force feedback · 04c1bfc1
  Kevin Balz authored Sep 22, 2019
  
  04c1bfc1
- Merge branch 'develop' of... · 1a7a5219
  Tim Scheiber authored Sep 22, 2019
```
Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/cpp/phaseshifter into develop
```
  1a7a5219
- level optimization · 2b9f9b7c
  Tim Scheiber authored Sep 22, 2019
  
  2b9f9b7c
- Merge branch 'develop' of... · 1112fe59
  Florian Oetke authored Sep 22, 2019
```
Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/cpp/phaseshifter into develop
```
  1112fe59
- updated engine · a2c8a67c
  Florian Oetke authored Sep 22, 2019
  
  a2c8a67c
- Merge branch 'develop' of... · 44eb5260
  Georg Schäfer authored Sep 22, 2019
```
Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/cpp/phaseshifter into develop
```
  44eb5260
- Add special attack animation. · 4bf1058a
  Georg Schäfer authored Sep 22, 2019
  
  4bf1058a
- fixed menu button · b523f452
  Florian Oetke authored Sep 22, 2019
  
  b523f452
- Merge branch 'develop' of... · 07aa1bf8
  Florian Oetke authored Sep 22, 2019
```
Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/cpp/phaseshifter into develop
```
  07aa1bf8
- updated engine · def5ae69
  Florian Oetke authored Sep 22, 2019
  
  def5ae69
- Merge branch 'develop' of... · 4a3f3c43
  Tim Scheiber authored Sep 22, 2019
```
Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/cpp/phaseshifter into develop
```
  4a3f3c43
- external · 6c1c9955
  Tim Scheiber authored Sep 22, 2019
  
  6c1c9955
- Merge branch 'develop' of... · b56470d7
  Florian Oetke authored Sep 22, 2019
```
Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/cpp/phaseshifter into develop
```
  b56470d7
- styled menues · 26512f74
  Florian Oetke authored Sep 22, 2019
  
  26512f74
- Merge branch 'develop' of... · eefbfea5
  Tim Scheiber authored Sep 22, 2019
```
Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/cpp/phaseshifter into develop
```
  eefbfea5
- finished level · 2e3c686b
  Tim Scheiber authored Sep 22, 2019
  
  2e3c686b
- Add pillar model. · db32890e
  Georg Schäfer authored Sep 22, 2019
  
  db32890e
- Merge branch 'develop' of... · b7a942b9
  Georg Schäfer authored Sep 22, 2019
```
Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/cpp/phaseshifter into develop
```
  b7a942b9
- Increase glow of enemies. · 685b9106
  Georg Schäfer authored Sep 22, 2019
  
  685b9106
- beat missed effect · f906f1ca
  Kevin Balz authored Sep 22, 2019
  
  f906f1ca
- Merge branch 'develop' of... · 456d84eb
  Georg Schäfer authored Sep 22, 2019
```
Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/cpp/phaseshifter into develop
```
  456d84eb
- Add drone material. · 99f4f030
  Georg Schäfer authored Sep 22, 2019
  
  99f4f030
- Merge branch 'develop' of... · 8b9846bb
  Florian Oetke authored Sep 22, 2019
```
Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/cpp/phaseshifter into develop
```
  8b9846bb
- styled menues (first draft) · 5e5b1c7b
  Florian Oetke authored Sep 22, 2019
  
  5e5b1c7b
- external · 6e9d11d0
  Tim Scheiber authored Sep 22, 2019
  
  6e9d11d0
- Merge branch 'develop' of... · 95ddf362
  Tim Scheiber authored Sep 22, 2019
```
Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/cpp/phaseshifter into develop
```
  95ddf362
- finished level · 738a1600
  Tim Scheiber authored Sep 22, 2019
  
  738a1600
- Add glow to bullet. · 170db4bc
  Georg Schäfer authored Sep 21, 2019
  
  170db4bc
- Add correct corner models to tileset. · efa91539
  Georg Schäfer authored Sep 21, 2019
  
  efa91539
- Merge branch 'develop' of... · 1411ba23
  Georg Schäfer authored Sep 21, 2019
```
Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/cpp/phaseshifter into develop
```
  1411ba23
- Add glowing floor. · f39cfbe6
  Georg Schäfer authored Sep 21, 2019
  
  f39cfbe6
- Merge branch 'feature/36-level-design' into 'develop' · 3d332b78
  Tim Scheiber authored Sep 21, 2019
```
Resolve "Level Design"

Closes #36

See merge request !26
```
  3d332b78
- Merge branch 'develop' into 'feature/36-level-design' · b801adb2
  Tim Scheiber authored Sep 21, 2019
```
# Conflicts:
#   assets/game_assets/tilesets/tileset.json
```
  b801adb2
- Merge branch 'develop' into feature/36-level-design · 4d496516
  Tim Scheiber authored Sep 21, 2019
  
  4d496516
- Merge branch 'develop' of... · 3fb64e03
  Georg Schäfer authored Sep 21, 2019
```
Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/cpp/phaseshifter into develop
```
  3fb64e03
- Add corner model. · 7aa91998
  Georg Schäfer authored Sep 21, 2019
  
  7aa91998
- unfinished level · 8ce0ccbc
  Tim Scheiber authored Sep 21, 2019
  
  8ce0ccbc
- Einzelteile Loading Screen und Menu Screen + Fonts für alle Fälle (im Menu Ordner) · 8a7be741
  Lena Kerstin Lund authored Sep 21, 2019
  
  8a7be741
- Loading Screen und Menu Screen mit Credits · 92c78c3b
  Lena Kerstin Lund authored Sep 21, 2019
  
  92c78c3b