Commits · master · GDW-WS-17 / unity / Sandcastle

09 Mar, 2019 1 commit
- Merge branch 'develop' into 'master' · db75c511
  Oliver Biwer authored Mar 09, 2019
```
Develop

See merge request GDW-WS-17/unity/Sandcastle!1
```
  db75c511
17 Apr, 2018 1 commit
- AddLoader aus Level 2 entfernt (das der immernoch da drin war?!) und · b10caace
  Thilo Bartel authored Apr 17, 2018
```
controls aktualisiert
```
  b10caace
09 Apr, 2018 7 commits
- Fixed Drop On Death Component for some Prefabs · 6d9d294b
  Tobias Gepp authored Apr 10, 2018
  
  6d9d294b
- Merge branch 'feature/MultipleNavmesh' into develop · e034dc72
  Tobias Gepp authored Apr 10, 2018
  
  e034dc72
- Updated Nav Meshes (reversed custom Voxel Size) · a05b2a97
  Tobias Gepp authored Apr 10, 2018
  
  a05b2a97
- Creates Vases Prefab · 11e511c5
  Tobias Gepp authored Apr 10, 2018
  
  11e511c5
- missed some files in previous commit · e1b1e9c7
  Tobias Gepp authored Apr 09, 2018
  
  e1b1e9c7
- wind magic and enemies now use the correct navmesh · 0a1e9e2d
  Tobias Gepp authored Apr 09, 2018
  
  0a1e9e2d
- Added multiple Navmeshes for varying agents. · 67eec042
  Tobias Gepp authored Apr 09, 2018
```
Restructured Level 1 hierachy.
```
  67eec042
29 Mar, 2018 1 commit
- no message · 8fbad27f
  Christopher Benes authored Mar 29, 2018
  
  8fbad27f
26 Mar, 2018 1 commit
- Letzer Stand Präsentation · 305c3408
  Christopher Benes authored Mar 27, 2018
  
  305c3408
21 Mar, 2018 2 commits
- fixed visbility of mouse in ingame menue · f612c6be
  Tobias Gepp authored Mar 21, 2018
  
  f612c6be
- Renaming and refactor some code, to remove all warnings. · 3f48a347
  Tobias Gepp authored Mar 21, 2018
  
  3f48a347
19 Mar, 2018 1 commit
- Updated and added Prefabs for multiple deko items · a50bc91d
  Tobias Gepp authored Mar 20, 2018
  
  a50bc91d
18 Mar, 2018 26 commits
- merge conflict · 857ade18
  Tobias Gepp authored Mar 18, 2018
  
  857ade18
- pull from orign with errors · d58a1afa
  Tobias Gepp authored Mar 18, 2018
  
  d58a1afa
- Merge branch 'develop' of... · 218c6d8e
  Christopher Benes authored Mar 18, 2018
```
Merge branch 'develop' of https://gitlab.fsi.hochschule-trier.de/GDW-WS-17/unity/Sandcastle into develop
```
  218c6d8e
- Update · 12482a45
  Christopher Benes authored Mar 18, 2018
  
  12482a45
- fix · 64c3b43c
  rftpool22 authored Mar 18, 2018
  
  64c3b43c
- fix · 21a0d12f
  rftpool22 authored Mar 18, 2018
  
  21a0d12f
- fix · 1f9b219b
  rftpool22 authored Mar 18, 2018
  
  1f9b219b
- fix · 99d0fab8
  rftpool22 authored Mar 18, 2018
  
  99d0fab8
- Fixed level3 · 68e565fb
  rftpool22 authored Mar 18, 2018
  
  68e565fb
- Merge branch 'develop' of... · 35f5d18f
  Christopher Benes authored Mar 18, 2018
```
Merge branch 'develop' of https://gitlab.fsi.hochschule-trier.de/GDW-WS-17/unity/Sandcastle into develop
```
  35f5d18f
- fix · 8d6a3588
  rftpool22 authored Mar 18, 2018
  
  8d6a3588
- Merge branch 'develop' of... · 02cb559e
  Christopher Benes authored Mar 18, 2018
```
Merge branch 'develop' of https://gitlab.fsi.hochschule-trier.de/GDW-WS-17/unity/Sandcastle into develop

# Conflicts:
#	Assets/Maps/Level01.unity
#	Assets/Maps/Level01/NavMesh.asset
#	Assets/Maps/Level01/NavMesh.asset.meta
#	Assets/Maps/Level03.unity
```
  02cb559e
- Update · ada7b7f2
  Christopher Benes authored Mar 18, 2018
  
  ada7b7f2
- fix · 645926ce
  rftpool22 authored Mar 18, 2018
  
  645926ce
- fix · 88a9246f
  rftpool22 authored Mar 18, 2018
  
  88a9246f
- fix · 6db5024d
  rftpool22 authored Mar 18, 2018
  
  6db5024d
- fix · e49c35d9
  rftpool22 authored Mar 18, 2018
  
  e49c35d9
- fixed blobs and skeletons in level 1 · c391042f
  rftpool22 authored Mar 18, 2018
  
  c391042f
- Merge branch 'feature/wind' into develop · 9faf81e8
  rftpool22 authored Mar 18, 2018
  
  9faf81e8
- QOL and fix · a76db388
  rftpool22 authored Mar 18, 2018
  
  a76db388
- Merge branch 'develop' into feature/wind · 70f4082c
  rftpool22 authored Mar 18, 2018
```
# Conflicts:
#	Assets/Prefabs/Objects/Boulder.prefab
#	Assets/Prefabs/Objects/Itemhearth.prefab
```
  70f4082c
- Merge branch 'develop' into feature/wind · 63d90ad7
  rftpool22 authored Mar 18, 2018
  
  63d90ad7
- adjusted prefabs · 9822b0ea
  Tobias Gepp authored Mar 18, 2018
  
  9822b0ea
- Changed Item drop system + made sure no complications occur when changing scene or quitting · 8b330af8
  Tobias Gepp authored Mar 18, 2018
  
  8b330af8
- Enemies no longer kill other enemies · da022eab
  Tobias Gepp authored Mar 18, 2018
  
  da022eab
- mistakes were made · 7ebb7b33
  Tobias Gepp authored Mar 18, 2018
  
  7ebb7b33