Commits · 14f055cd8652e7f6698f1dd0ad5f42380c88aa38 · GameDevWeek / Wintersemester 2018-2019 / Unity / Suck It · GitLab

28 Mar, 2019 19 commits
- Merge remote-tracking branch 'origin/master' · 14f055cd
  Sebastian Frey authored Mar 28, 2019
  
  14f055cd
- charges für das Element hinzugefügt · 86fcd798
  Sebastian Frey authored Mar 28, 2019
  
  86fcd798
- Merge remote-tracking branch 'origin/master' · 76b3b2cb
  Unknown authored Mar 28, 2019
  
  76b3b2cb
- Movement Controller sollte nicht mehr an Wänden Hängen bleiben · d6fb3255
  Unknown authored Mar 28, 2019
  
  d6fb3255
- Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/suck-it · 29e5f60a
  Christopher Benes authored Mar 28, 2019
  
  29e5f60a
- lemme pull · 04d6b1db
  Christopher Benes authored Mar 28, 2019
  
  04d6b1db
- som small stuff · 7cf6460a
  Unknown authored Mar 28, 2019
  
  7cf6460a
- Merge remote-tracking branch 'origin/master' · f116ba90
  Unknown authored Mar 28, 2019
  
  f116ba90
- Einbeziehen von Movement Verhalten in unterschiedlichen Spieler Statie · 4d4a686b
  Unknown authored Mar 28, 2019
  
  4d4a686b
- Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/ws-18_19/unity/suck-it · d63f5342
  mthiele2 authored Mar 28, 2019
  
  d63f5342
- Stoff und Schnaps · 5154e18a
  mthiele2 authored Mar 28, 2019
  
  5154e18a
- Merge remote-tracking branch 'origin/master' · 65c57136
  Sebastian Frey authored Mar 28, 2019
  
  65c57136
- code cleanup · 6ae6834b
  Sebastian Frey authored Mar 28, 2019
  
  6ae6834b
- Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/suck-it · e8e5f499
  Christopher Benes authored Mar 28, 2019
  
  e8e5f499
- MainLevel Update drölftausend · 93f6567e
  Christopher Benes authored Mar 28, 2019
  
  93f6567e
- Folder-Cleanup · 16147cea
  mthiele2 authored Mar 28, 2019
  
  16147cea
- Isa macht Sachen · f1423c2b
  Isa authored Mar 28, 2019
  
  f1423c2b
- HUD · 64411c99
  Isa authored Mar 28, 2019
  
  64411c99
- Experiment für Animation der Wasser-Attacke · 4a85b43e
  Sebastian authored Mar 28, 2019
  
  4a85b43e
27 Mar, 2019 21 commits
- Merge remote-tracking branch 'origin/master' · 4252cd21
  Unknown authored Mar 27, 2019
  
  4252cd21
- Slider Object Update · 46e08797
  Unknown authored Mar 27, 2019
  
  46e08797
- MainLevel Update 5000 · 69051c0c
  Christopher Benes authored Mar 27, 2019
  
  69051c0c
- Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/suck-it · 0c4186c8
  Christopher Benes authored Mar 27, 2019
  
  0c4186c8
- lemme pull · 54a22828
  Christopher Benes authored Mar 27, 2019
  
  54a22828
- Merge remote-tracking branch 'origin/master' · 472c5783
  Unknown authored Mar 27, 2019
  
  472c5783
- Merge remote-tracking branch 'origin/master' · d6c5c3f3
  Sebastian Frey authored Mar 27, 2019
  
  d6c5c3f3
- fixed Script conflict · 64cdc6be
  Sebastian Frey authored Mar 27, 2019
  
  64cdc6be
- Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/ws-18_19/unity/suck-it · 044c1c50
  mthiele2 authored Mar 27, 2019
```
# Conflicts:
#	Assets/Neuer Ordner.meta
```
  044c1c50
- WUNDERBAR · 24f694d7
  mthiele2 authored Mar 27, 2019
  
  24f694d7
- Water Logik · 7a560776
  Unknown authored Mar 27, 2019
  
  7a560776
- Merge remote-tracking branch 'origin/master' · 2b7d9b35
  Sebastian Frey authored Mar 27, 2019
  
  2b7d9b35
- Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/base · 21383f17
  Markus Schlösser authored Mar 27, 2019
```
# Conflicts:
#	.gitlab-ci.yml
```
  21383f17
- Merge remote-tracking branch 'origin/master' · 6c6d8a4e
  Sebastian Frey authored Mar 27, 2019
  
  6c6d8a4e
- SuperMario-Jump hinzugefügt · 33686b56
  Sebastian Frey authored Mar 27, 2019
  
  33686b56
- Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/suck-it · 2fba50f7
  Christopher Benes authored Mar 27, 2019
  
  2fba50f7
- Ready to build · bab35a2d
  Christopher Benes authored Mar 27, 2019
  
  bab35a2d
- Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/ws-18_19/unity/suck-it · 5b34a7ba
  mthiele2 authored Mar 27, 2019
  
  5b34a7ba
- Update Enemy Patrol · 7d1cc6bf
  mthiele2 authored Mar 27, 2019
  
  7d1cc6bf
- Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/suck-it · bf4aac66
  Christopher Benes authored Mar 27, 2019
  
  bf4aac66
- MainLevel Update · 73004554
  Christopher Benes authored Mar 27, 2019
  
  73004554