Commits · 3be47f31ffbc7e593cf5ba891007fffbbea2b525 · GameDevWeek / Wintersemester 2018-2019 / Unity / Suck It · GitLab

30 Mar, 2019 40 commits
- Alles · 3be47f31
  Isa authored Mar 30, 2019
  
  3be47f31
- Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/suck-it · f294b8c7
  Christopher Benes authored Mar 30, 2019
  
  f294b8c7
- lemme pull · 29255ccb
  Christopher Benes authored Mar 30, 2019
  
  29255ccb
- Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/suck-it · 7f6bc4b6
  Michael But authored Mar 30, 2019
  
  7f6bc4b6
- Steuerung für what ever · 65510f66
  Michael But authored Mar 30, 2019
  
  65510f66
- Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/ws-18_19/unity/suck-it · 09287cb2
  Isa authored Mar 30, 2019
  
  09287cb2
- EndScreen · 9e758973
  Isa authored Mar 30, 2019
  
  9e758973
- Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/suck-it · f9ebabbd
  Christopher Benes authored Mar 30, 2019
```
# Conflicts:
#	Assets/_Game/Animations/Player.meta
#	Assets/_Game/Scenes/MainLevel.unity
```
  f9ebabbd
- MainLevel polishing & warten auf Pizza · e9359bb5
  Christopher Benes authored Mar 30, 2019
  
  e9359bb5
- Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/suck-it · e2654c51
  Sebastian authored Mar 30, 2019
```
Merge for pull
```
  e2654c51
- small fixes · 2956377e
  Sebastian authored Mar 30, 2019
  
  2956377e
- small bugfix für Exception in SavePoint-Script · 8a90b831
  Sebastian authored Mar 30, 2019
  
  8a90b831
- MovementController updates MovementState on Awake · c4a0c291
  Sebastian authored Mar 30, 2019
  
  c4a0c291
- Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/suck-it · 063ce07c
  Michael But authored Mar 30, 2019
  
  063ce07c
- HUD Text für die Fähigkeiten · 8274b11d
  Michael But authored Mar 30, 2019
  
  8274b11d
- Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/suck-it · aa2c9f87
  Sebastian authored Mar 30, 2019
```
merge for pull
```
  aa2c9f87
- smaller fixes · ed57dd11
  Sebastian authored Mar 30, 2019
  
  ed57dd11
- Merge remote-tracking branch 'origin/master' · 8f1d1b56
  Unknown authored Mar 30, 2019
  
  8f1d1b56
- Scale Fix · aeefeaba
  Unknown authored Mar 30, 2019
  
  aeefeaba
- fixed warning with velocity of static Rigidbody2D · 201baaaa
  Sebastian authored Mar 30, 2019
  
  201baaaa
- Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/suck-it · 2ae7e55c
  Michael But authored Mar 30, 2019
  
  2ae7e55c
- Stuff · 0c97d2dd
  mthiele2 authored Mar 30, 2019
  
  0c97d2dd
- Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/ws-18_19/unity/suck-it · 121ae80c
  mthiele2 authored Mar 30, 2019
  
  121ae80c
- Animations und Zeugs · 56e9b7d0
  mthiele2 authored Mar 30, 2019
  
  56e9b7d0
- Movement balancing · c3f376c3
  Christopher Benes authored Mar 30, 2019
  
  c3f376c3
- Movement Balancing · 73353aa7
  Christopher Benes authored Mar 30, 2019
  
  73353aa7
- zack Fertich · 83998179
  Unknown authored Mar 30, 2019
  
  83998179
- more Bug Fixes · 6b28333c
  Unknown authored Mar 30, 2019
  
  6b28333c
- Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/suck-it · 86a15e6f
  Sebastian authored Mar 30, 2019
```
merge into master
```
  86a15e6f
- fire destroys on contact with everything but ground; damges water enemy · 03809be5
  Sebastian authored Mar 30, 2019
  
  03809be5
- HUD Veränderungen · aa4c5b85
  Michael But authored Mar 30, 2019
  
  aa4c5b85
- Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/ws-18_19/unity/suck-it · b54608a9
  mthiele2 authored Mar 30, 2019
  
  b54608a9
- Erd-Gegner Vollidioten Script · bb11d4dc
  mthiele2 authored Mar 30, 2019
  
  bb11d4dc
- Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/ws-18_19/unity/suck-it · 56397634
  Isa authored Mar 30, 2019
  
  56397634
- SafePoint Text · be8d96b9
  Isa authored Mar 30, 2019
  
  be8d96b9
- Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/suck-it · 1e4de605
  Michael But authored Mar 30, 2019
  
  1e4de605
- Tot is mogeli di · a2131173
  Michael But authored Mar 30, 2019
  
  a2131173
- Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/ws-18_19/unity/suck-it · dc20d0fc
  mthiele2 authored Mar 30, 2019
  
  dc20d0fc
- Debug-entfernt · 07e7cadc
  mthiele2 authored Mar 30, 2019
  
  07e7cadc
- Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/ws-18_19/unity/suck-it · 860021db
  Isa authored Mar 30, 2019
  
  860021db