Commits · master · GameDevWeek / Wintersemester 2018-2019 / Unity / Orchestra Defense

31 Mar, 2019 1 commit
- $DESKTOP-753A1KM\Robin's avatar$
  
  Finale · 3551bde6
  DESKTOP-753A1KM\Robin authored Mar 31, 2019
  
  3551bde6
30 Mar, 2019 39 commits
- $DESKTOP-753A1KM\Robin's avatar$
  
  Fixes · 81aef11f
  DESKTOP-753A1KM\Robin authored Mar 31, 2019
  
  81aef11f
- $DESKTOP-753A1KM\Robin's avatar$
  Merge branch 'master' of... · e5e288bb
  DESKTOP-753A1KM\Robin authored Mar 31, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/orchestra-defense
```
  e5e288bb
- $DESKTOP-753A1KM\Robin's avatar$
  
  Final · 5ce5653a
  DESKTOP-753A1KM\Robin authored Mar 31, 2019
  
  5ce5653a
- level fix · ddbeb506
  Karamellchen authored Mar 30, 2019
  
  ddbeb506
- woken · 1fb1c974
  Karamellchen authored Mar 30, 2019
  
  1fb1c974
- Merge branch 'master' of... · 0311b503
  Karamellchen authored Mar 30, 2019
```
Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/ws-18_19/unity/orchestra-defense
```
  0311b503
- alle level spielbar · 2c726da1
  Karamellchen authored Mar 30, 2019
  
  2c726da1
- Merge branch 'master' of... · af4434aa
  Long Nguyen authored Mar 30, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/orchestra-defense
```
  af4434aa
- HUD Verbessert · 95c5a14f
  Long Nguyen authored Mar 30, 2019
  
  95c5a14f
- $DESKTOP-753A1KM\Robin's avatar$
  
  changes · dfd7d7d4
  DESKTOP-753A1KM\Robin authored Mar 30, 2019
  
  dfd7d7d4
- $DESKTOP-753A1KM\Robin's avatar$
  
  BugFixes · 47d4ba93
  DESKTOP-753A1KM\Robin authored Mar 30, 2019
  
  47d4ba93
- $DESKTOP-753A1KM\Robin's avatar$
  
  adolf beethoven · efe886fc
  DESKTOP-753A1KM\Robin authored Mar 30, 2019
  
  efe886fc
- $DESKTOP-753A1KM\Robin's avatar$
  Merge branch 'master' of... · 5e6fe8a1
  DESKTOP-753A1KM\Robin authored Mar 30, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/orchestra-defense
```
  5e6fe8a1
- $DESKTOP-753A1KM\Robin's avatar$
  
  robins farben korrigiert · 52dd047c
  DESKTOP-753A1KM\Robin authored Mar 30, 2019
  
  52dd047c
- Merge branch 'master' of... · 9b0f703e
  Domm29 authored Mar 30, 2019
```
Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/ws-18_19/unity/orchestra-defense
```
  9b0f703e
- Tower Upgrades Balancing teil 4 alone again · f3bc598e
  Domm29 authored Mar 30, 2019
  
  f3bc598e
- Tower schießen nicht mehr ständig langsamer, wenn sie nach dem "Speed-Up" Skill gesetzt werden · a1f52520
  BlckTgr authored Mar 30, 2019
  
  a1f52520
- Blut ist jetzt endlich unter den Gegnern! · e5c600fd
  BlckTgr authored Mar 30, 2019
  
  e5c600fd
- Dirigent hat jetzt eine funktionierende Skill-Animation · d6a66158
  BlckTgr authored Mar 30, 2019
  
  d6a66158
- Neues Skript für Dirigenten eingefügt, das die Skillanimation abspielen soll · 4939294d
  BlckTgr authored Mar 30, 2019
  
  4939294d
- Merge branch 'master' of... · 39758c10
  JEthan authored Mar 30, 2019
```
Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/ws-18_19/unity/orchestra-defense
```
  39758c10
- Level 1 hat jetzt ein Options menu · a5baeeb8
  JEthan authored Mar 30, 2019
  
  a5baeeb8
- Merge branch 'master' of... · 6f08ee3a
  Domm29 authored Mar 30, 2019
```
Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/ws-18_19/unity/orchestra-defense
```
  6f08ee3a
- Balancing Teil 3? allein :( · 8b2cf2a9
  Domm29 authored Mar 30, 2019
  
  8b2cf2a9
- $DESKTOP-753A1KM\Robin's avatar$
  Merge branch 'master' of... · f848dbc4
  DESKTOP-753A1KM\Robin authored Mar 30, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/orchestra-defense

# Conflicts:
#	Assets/_Game/Scenes/Level1.unity
```
  f848dbc4
- $DESKTOP-753A1KM\Robin's avatar$
  
  SoundManager Changes · 045f3247
  DESKTOP-753A1KM\Robin authored Mar 30, 2019
  
  045f3247
- dead · 06473306
  Karamellchen authored Mar 30, 2019
  
  06473306
- Merge branch 'master' of... · 5846a6a5
  Domm29 authored Mar 30, 2019
```
Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/ws-18_19/unity/orchestra-defense
```
  5846a6a5
- $DESKTOP-753A1KM\Robin's avatar$
  Merge branch 'master' of... · 54891ab0
  DESKTOP-753A1KM\Robin authored Mar 30, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/orchestra-defense
```
  54891ab0
- $DESKTOP-753A1KM\Robin's avatar$
  
  sm-prefab · 34499b98
  DESKTOP-753A1KM\Robin authored Mar 30, 2019
  
  34499b98
- Merge branch 'master' of... · 8bdc2850
  JEthan authored Mar 30, 2019
```
Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/ws-18_19/unity/orchestra-defense
```
  8bdc2850
- Feinschlif und ein zwei bugs · b4a92a36
  Domm29 authored Mar 30, 2019
  
  b4a92a36
- Merge branch 'master' of... · 193029cb
  Long Nguyen authored Mar 30, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/orchestra-defense
```
  193029cb
- Kleine veränderungen an der Laustärke regelung · a3fac964
  JEthan authored Mar 30, 2019
  
  a3fac964
- Polished UI · cecf2932
  Long Nguyen authored Mar 30, 2019
  
  cecf2932
- Blutsprite bei Gegner-Tod hinzugefügt (Animation ist noch in einem Loop!) · 575b1c1b
  BlckTgr authored Mar 30, 2019
  
  575b1c1b
- Menu verschönerung · 751eb26f
  Karamellchen authored Mar 30, 2019
  
  751eb26f
- Prefabs aktualisiert · 8a4e86ef
  Long Nguyen authored Mar 30, 2019
  
  8a4e86ef
- Merge branch 'master' of... · f7de4639
  JEthan authored Mar 30, 2019
```
Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/ws-18_19/unity/orchestra-defense

# Conflicts:
#	Assets/_Game/Scenes/TestScenes/Sce_Long_Options.unity
```
  f7de4639