Commits · 0.1.3 · GameDevWeek / Wintersemester 2018-2019 / Unity / 10 kleine Lemminge

29 Mar, 2019 38 commits
- Build settings fixed, fireball added · 2ca8f563
  Jan Meissner authored Mar 29, 2019
  
  2ca8f563
- Fixed bomb layer · 181fd1f8
  Jan Meissner authored Mar 29, 2019
  
  181fd1f8
- Updated bomb · cb84a2c4
  Jan Meissner authored Mar 29, 2019
  
  cb84a2c4
- Merge remote-tracking branch 'origin/master' · 94a74a43
  Jan Meissner authored Mar 29, 2019
  
  94a74a43
- Bomb updated · 96920020
  Jan Meissner authored Mar 29, 2019
  
  96920020
- Merge remote-tracking branch 'origin/master' · 610c1cdc
  Marcel authored Mar 29, 2019
  
  610c1cdc
- Made Script for BY Ability destroyable Objects and edited Layers and Prefabs of Abilitys · 21644dbe
  Marcel authored Mar 29, 2019
  
  21644dbe
- Merge remote-tracking branch 'origin/master' · a674af2f
  Jan Meissner authored Mar 29, 2019
  
  a674af2f
- ooooopsi - Part 3 · 230dbdeb
  Jan Meissner authored Mar 29, 2019
  
  230dbdeb
- Merge remote-tracking branch 'origin/master' · 88f508ae
  Marcel authored Mar 29, 2019
  
  88f508ae
- meta changed commit to pull/push · d2d874fd
  Marcel authored Mar 29, 2019
  
  d2d874fd
- oooopsie - Part 2 · 4c82cb10
  Jan Meissner authored Mar 29, 2019
  
  4c82cb10
- Merge remote-tracking branch 'origin/master' · 90949255
  Marcel authored Mar 29, 2019
```
merge conflict
```
  90949255
- Commit to pull the fix · fcbbfeeb
  Marcel authored Mar 29, 2019
```
changed name atribute in potions
```
  fcbbfeeb
- ooopsie · 73b7ecdc
  Jan Meissner authored Mar 29, 2019
  
  73b7ecdc
- Various movement related fixes · 7766d750
  Jan Meissner authored Mar 29, 2019
  
  7766d750
- Merge branch 'master' of... · 68329a88
  KirschStreuselKuchen authored Mar 29, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/10-kleine-lemminge
```
  68329a88
- Fixed build · d76cf5bb
  KirschStreuselKuchen authored Mar 29, 2019
  
  d76cf5bb
- Merge remote-tracking branch 'origin/master' · 9c192c3b
  Frederic Nicolas Schneider authored Mar 29, 2019
  
  9c192c3b
- Add graphics · feeee798
  Frederic Nicolas Schneider authored Mar 29, 2019
  
  feeee798
- Merge gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/base · b6b7c095
  Markus Schlösser authored Mar 29, 2019
  
  b6b7c095
- Merge remote-tracking branch 'origin/master' · 396b1e91
  HavocDeadeye authored Mar 29, 2019
  
  396b1e91
- Killlemming scrip updated · 26135664
  HavocDeadeye authored Mar 29, 2019
  
  26135664
- Merge remote-tracking branch 'origin/master' · 56635e6e
  KirschStreuselKuchen authored Mar 29, 2019
  
  56635e6e
- Korrektur beim Laden vom Titel Menu zum Level, löschen nun unnötiger Szenen.... · 8ea7131d
  KirschStreuselKuchen authored Mar 29, 2019
```
Korrektur beim Laden vom Titel Menu zum Level, löschen nun unnötiger Szenen. Methode für nächstes LevelLaden erstellt.
```
  8ea7131d
- Updated .gitlab-ci.yml · fbee6f2b
  Markus Schlösser authored Mar 29, 2019
  
  fbee6f2b
- Merge remote-tracking branch 'origin/master' · 714992fa
  HavocDeadeye authored Mar 29, 2019
  
  714992fa
- Updated Level 1-3 · d9dfbee7
  HavocDeadeye authored Mar 29, 2019
  
  d9dfbee7
- Add max lemming count in group · e4bc32db
  Frederic Nicolas Schneider authored Mar 29, 2019
  
  e4bc32db
- Updated .gitlab-ci.yml · 54671b49
  Markus Schlösser authored Mar 29, 2019
  
  54671b49
- Add GameManager vars · 2ba865d7
  Frederic Nicolas Schneider authored Mar 29, 2019
  
  2ba865d7
- Merge remote-tracking branch 'origin/master' · 3180f87d
  Frederic Nicolas Schneider authored Mar 29, 2019
  
  3180f87d
- Some changes on KillLemming Script · 4fe942d7
  HavocDeadeye authored Mar 29, 2019
  
  4fe942d7
- Updated .gitlab-ci.yml · bfb1223f
  Markus Schlösser authored Mar 29, 2019
  
  bfb1223f
- Merge remote-tracking branch 'origin/master' · 72c3d349
  HavocDeadeye authored Mar 29, 2019
  
  72c3d349
- Level 1&2 Gemeshed · e769328b
  HavocDeadeye authored Mar 29, 2019
  
  e769328b
- Fixed group lemming · ccfcd716
  Frederic Nicolas Schneider authored Mar 29, 2019
  
  ccfcd716
- Auto stash before merge of "master" and "origin/master" · 9f7a3fea
  Frederic Nicolas Schneider authored Mar 29, 2019
  
  9f7a3fea
28 Mar, 2019 2 commits

Merge remote-tracking branch 'origin/master' · 4346333f
Marcel authored Mar 29, 2019

4346333f

Marcel authored Mar 29, 2019

Made Objects Destroyable
Made Destroyable Tilemap (script still need to find cordinates of collided tile)
Changed all prefabs byy adding a rigibody (this way the Objects are killable by script destroyableObject)

3bc995eb