Commits · 99d0fab8638ab1d9782b6f97584a5f9583e8c2e3 · GDW-WS-17 / unity / Sandcastle

18 Mar, 2018 25 commits
- 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
- Prevented objects from spawning when changeing scenes · f7aa458e
  Tobias Gepp authored Mar 18, 2018
  
  f7aa458e
- Updated prefabs , Mummy not yet correct (Interface) · debbb9a8
  Tobias Gepp authored Mar 18, 2018
  
  debbb9a8
- removed unused scripts · ee2b554b
  Tobias Gepp authored Mar 18, 2018
  
  ee2b554b
- Replaced deprecated TorchLight Functions · 17d25d8e
  Tobias Gepp authored Mar 18, 2018
  
  17d25d8e
- Half the fix for the rotation when attacking... Blobs assets is rotated itself · 813ef7b0
  Tobias Gepp authored Mar 18, 2018
  
  813ef7b0
- Removed some Debugs + minor failsave improvements. · b2330da4
  Tobias Gepp authored Mar 18, 2018
  
  b2330da4
17 Mar, 2018 15 commits
- Merge branch 'develop' of... · 1cf5a123
  Tobias Gepp authored Mar 18, 2018
```
Merge branch 'develop' of https://gitlab.fsi.hochschule-trier.de/GDW-WS-17/unity/Sandcastle into develop
```
  1cf5a123
- FIXED that damned Navmesh Agent Bug ... war allerdings schon immer "falsch",... · 3c5bdc2f
  Tobias Gepp authored Mar 18, 2018
```
FIXED that damned Navmesh Agent Bug ... war allerdings schon immer "falsch", hattter nur vorher trotzdem finktioniert ...
```
  3c5bdc2f
- Added Earth block spell · 46c56151
  rftpool22 authored Mar 17, 2018
  
  46c56151
- Update · e263a695
  Christopher Benes authored Mar 17, 2018
  
  e263a695
- Merge branch 'develop' of... · ca62dc4b
  Christopher Benes authored Mar 17, 2018
```
Merge branch 'develop' of https://gitlab.fsi.hochschule-trier.de/GDW-WS-17/unity/Sandcastle into develop
```
  ca62dc4b
- Update_alles · a6b8659d
  Christopher Benes authored Mar 17, 2018
  
  a6b8659d
- Merge branch 'develop' of... · 20e6a049
  Thilo Bartel authored Mar 17, 2018
```
Merge branch 'develop' of https://gitlab.fsi.hochschule-trier.de/GDW-WS-17/unity/Sandcastle into develop
```
  20e6a049
- mummy animation is entered but doesnt work. · 8831ff17
  Thilo Bartel authored Mar 17, 2018
  
  8831ff17
- Merge branch 'develop' of... · 9f3b7370
  Christopher Benes authored Mar 17, 2018
```
Merge branch 'develop' of https://gitlab.fsi.hochschule-trier.de/GDW-WS-17/unity/Sandcastle into develop
```
  9f3b7370
- Update_Level01+02 · 6eff5a2a
  Christopher Benes authored Mar 17, 2018
  
  6eff5a2a
- Merge branch 'develop' into feature/wind · cf13dd55
  rftpool22 authored Mar 17, 2018
  
  cf13dd55
- Added Wind Teleport. Only works on NavMesh. · cce4928b
  rftpool22 authored Mar 17, 2018
  
  cce4928b
- Merge branch 'develop' of... · ed2e32c8
  Thilo Bartel authored Mar 17, 2018
```
Merge branch 'develop' of https://gitlab.fsi.hochschule-trier.de/GDW-WS-17/unity/Sandcastle into develop
```
  ed2e32c8
- skeleton animation in test03.unity · 748cc018
  Thilo Bartel authored Mar 17, 2018
  
  748cc018
- Merge branch 'develop' of... · 4748d287
  Christopher Benes authored Mar 17, 2018
```
Merge branch 'develop' of https://gitlab.fsi.hochschule-trier.de/GDW-WS-17/unity/Sandcastle into develop
```
  4748d287