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

27 Mar, 2019 1 commit
- SavePoint und PlayerSpawnPoint Script erstellt und ist Funktiontüchtig. · fb0af611
  Michael But authored Mar 27, 2019
  
  fb0af611
26 Mar, 2019 34 commits
- Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/suck-it · d636cd6a
  Michael But authored Mar 26, 2019
```
# Conflicts:
#	Assets/_Game/Data/Player Data.meta
```
  d636cd6a
- Save und Load u. neue Scene aus der Main · de626af5
  Michael But authored Mar 26, 2019
  
  de626af5
- Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/ws-18_19/unity/suck-it · 866cc9b0
  mthiele2 authored Mar 26, 2019
```
# Conflicts:
#	Assets/_Game/Data/Player Data/Movement Data.meta
```
  866cc9b0
- AI-Cleanup · 54638a93
  mthiele2 authored Mar 26, 2019
  
  54638a93
- MainLevel Update · ff8fb112
  Christopher Benes authored Mar 26, 2019
  
  ff8fb112
- MainLevel Update · b4679731
  Christopher Benes authored Mar 26, 2019
  
  b4679731
- Merge remote-tracking branch 'origin/master' · a4ffa24e
  Unknown authored Mar 26, 2019
  
  a4ffa24e
- kurze Verbesserung des Movement Controller · d7a682f9
  Unknown authored Mar 26, 2019
  
  d7a682f9
- Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/suck-it · 1c12a815
  Michael But authored Mar 26, 2019
  
  1c12a815
- Kleine Änderungen an SavePoint Script und Prefab für die SavePoints angelegt. · 6a854dcc
  Michael But authored Mar 26, 2019
  
  6a854dcc
- Merge remote-tracking branch 'origin/master' · ae69e083
  Sebastian Frey authored Mar 26, 2019
  
  ae69e083
- Merge remote-tracking branch 'origin/master' · 5eecb64a
  Sebastian Frey authored Mar 26, 2019
  
  5eecb64a
- MovementStates für alle Elemente hinzugefügt · ad06c622
  Sebastian Frey authored Mar 26, 2019
  
  ad06c622
- Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/suck-it · df6c3f4a
  Christopher Benes authored Mar 26, 2019
  
  df6c3f4a
- Main Lvel edited · 53e91507
  Christopher Benes authored Mar 26, 2019
  
  53e91507
- Merge remote-tracking branch 'origin/master' · 494f82df
  Unknown authored Mar 26, 2019
  
  494f82df
- Merge remote-tracking branch 'origin/master' · 9699ec89
  Unknown authored Mar 26, 2019
  
  9699ec89
- Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/ws-18_19/unity/suck-it · 49a843fe
  mthiele2 authored Mar 26, 2019
  
  49a843fe
- AI-Main Level Klon · b212ca9b
  mthiele2 authored Mar 26, 2019
  
  b212ca9b
- Charakter Movement Controller · 215476b2
  Unknown authored Mar 26, 2019
```
Simple Bewegungskontrolle des Charakters
```
  215476b2
- Merge remote-tracking branch 'origin/master' · f5105c6c
  Sebastian Frey authored Mar 26, 2019
  
  f5105c6c
- fixed Layer-Abfrage bei Kollision zwischen Spieler und Element · 45de0e24
  Sebastian Frey authored Mar 26, 2019
  
  45de0e24
- Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/ws-18_19/unity/suck-it · 5324457a
  Isa authored Mar 26, 2019
```
# Conflicts:
#	Assets/Neuer Ordner.meta
#	Assets/_Game/Scripts/SaveAndLoad.meta
#	Assets/_Game/Scripts/UI.meta
```
  5324457a
- PausenMenü Anfang · a0de6a22
  Isa authored Mar 26, 2019
  
  a0de6a22
- Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/suck-it · 062b729a
  Michael But authored Mar 26, 2019
```
# Conflicts:
#	Packages/manifest.json
```
  062b729a
- Speicher Punkte und eigene Scene + Ordner · 99df319e
  Michael But authored Mar 26, 2019
  
  99df319e
- Auto stash before merge of "master" and "origin/master" · ffd2f3a6
  Sebastian Frey authored Mar 26, 2019
  
  ffd2f3a6
- Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/ws-18_19/unity/suck-it · fde8bc43
  mthiele2 authored Mar 26, 2019
  
  fde8bc43
- AI Erdgegner prototyp · 83cc7a2f
  mthiele2 authored Mar 26, 2019
  
  83cc7a2f
- Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/suck-it · 2b5e52be
  Christopher Benes authored Mar 26, 2019
  
  2b5e52be
- MainLevel createt · 2a9bac16
  Christopher Benes authored Mar 26, 2019
  
  2a9bac16
- Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/ws-18_19/unity/suck-it · 72d3c154
  Isa authored Mar 26, 2019
  
  72d3c154
- JSON File hotfix · 0e742874
  Christopher Benes authored Mar 26, 2019
  
  0e742874
- Will pullen für Fehlerbehebung · 0915ed7e
  Isa authored Mar 26, 2019
  
  0915ed7e
25 Mar, 2019 5 commits
- Auto stash before merge of "master" and "origin/master" · 823f3c93
  Unknown authored Mar 25, 2019
  
  823f3c93
- Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/ws-18_19/unity/suck-it · 303c8f98
  mthiele2 authored Mar 25, 2019
```
# Conflicts:
#	ProjectSettings/TagManager.asset
```
  303c8f98
- AI - Der Riesen-Commit · bd36bbee
  mthiele2 authored Mar 25, 2019
  
  bd36bbee
- Pullen Versuch 2 · 67e7a618
  Christopher Benes authored Mar 25, 2019
  
  67e7a618
- Prototype Level created · bcbcb8c7
  Christopher Benes authored Mar 25, 2019
  
  bcbcb8c7