Commits · develop · Joey Docter / Vrij II

Jul 06, 2022
- Merge branch 'prototype' into 'develop' · 7bb3c57e
  Joey Docter authored 2 years ago
```
modified prefabs

See merge request !54
```
  7bb3c57e
- modified prefabs · 9ba6dd1b
  Joey Docter authored 2 years ago
  
  9ba6dd1b
Jun 24, 2022
- Merge branch 'prototype' into 'develop' · ee0de9ee
  Joey Docter authored 3 years ago
```
Prototype

See merge request !53
```
  ee0de9ee
Jun 23, 2022
- added private in scripts · d06c4361
  Joey Docter authored 3 years ago
  
  d06c4361
- refactor code · 2d1e84f7
  Joey Docter authored 3 years ago
  
  2d1e84f7
Jun 16, 2022
- changed variables · 88c42350
  Joey Docter authored 3 years ago
  
  88c42350
Jun 15, 2022
- Merge branch 'prototype' into 'develop' · 9753eabe
  Joey Docter authored 3 years ago
```
Prototype

See merge request !52
```
  9753eabe
- quick fix upgrade bug · aac0c9de
  Joey Docter authored 3 years ago
  
  aac0c9de
- fixed bugs for new prototype · 9742e1c0
  Joey Docter authored 3 years ago
  
  9742e1c0
Jun 14, 2022
- Merge branch 'prototype' into 'develop' · 24213774
  Joey Docter authored 3 years ago
```
new scene created

See merge request !51
```
  24213774
- new scene created · f8d4ac4b
  Joey Docter authored 3 years ago
  
  f8d4ac4b
- Merge branch 'Liselotte' into 'develop' · b5f69211
  Joey Docter authored 3 years ago
```
World Building V3 Nieuwe scene

See merge request !50
```
  b5f69211
- World Building V3 Nieuwe scene · 1ec5520e
  LiselotteBeijen authored 3 years ago
  
  1ec5520e
- Merge branch 'prototype' into 'develop' · 5daaae83
  Joey Docter authored 3 years ago
```
Prototype

See merge request !49
```
  5daaae83
Jun 13, 2022
- added sound in enemy counter · a129d225
  Joey Docter authored 3 years ago
  
  a129d225
- Merge branch 'jacco-2' into 'develop' · 4d158fc6
  Joey Docter authored 3 years ago
```
Jacco 2

See merge request !48
```
  4d158fc6
- Merge branch 'develop' into 'jacco-2' · 655be3a5
  Joey Docter authored 3 years ago
```
# Conflicts:
#   Vrij II/Assets/Scripts/AI and spawner scripts/EnemyCounter.cs
```
  655be3a5
- new prototype scene · 0149d4a5
  Joey Docter authored 3 years ago
  
  0149d4a5
- button fixed ? · de277d28
  Joey Docter authored 3 years ago
  
  de277d28
- Finished result screen · 094b0874
  Jacco Verhoeckx authored 3 years ago
  
  094b0874
- added option to increase spawned children every round, individually tweakable from each spawner · 94f8e821
  Jacco Verhoeckx authored 3 years ago
  
  94f8e821
- fixed weird rotation bug when grabbed + grab point location · ed4a09b8
  Jacco Verhoeckx authored 3 years ago
  
  ed4a09b8
Jun 12, 2022
- fmod log · d9027eff
  Joey Docter authored 3 years ago
  
  d9027eff
- Merge branch 'prototype' into 'develop' · 82a86183
  Joey Docter authored 3 years ago
```
Prototype

See merge request !46
```
  82a86183
- Merge branch 'develop' into 'prototype' · 1faf38a9
  Joey Docter authored 3 years ago
```
# Conflicts:
#   Vrij II/Assets/Plugins/FMOD/Cache/Editor/FMODStudioCache.asset
#   Vrij II/fmod_editor.log
```
  1faf38a9
- Merge branch 'jacco-2' into 'develop' · 1c9cd9bf
  Joey Docter authored 3 years ago
```
Jacco 2

See merge request !45
```
  1c9cd9bf
- added sound and particles · 1f756e1a
  Joey Docter authored 3 years ago
  
  1f756e1a
- finished animations for children · 878e8e60
  Jacco Verhoeckx authored 3 years ago
  
  878e8e60
- Implemented updates into AI scene + fixed weird rotation bug for children · 1604c2b7
  Jacco Verhoeckx authored 3 years ago
  
  1604c2b7
- fixed arm bug · b5fb13a2
  Joey Docter authored 3 years ago
  
  b5fb13a2
- Merge branch 'jacco-2' into 'develop' · ecd77435
  Joey Docter authored 3 years ago
```
Jacco 2

See merge request !44
```
  ecd77435
- Merge branch 'develop' into 'jacco-2' · 7f969270
  Joey Docter authored 3 years ago
```
# Conflicts:
#   Vrij II/Assets/Plugins/FMOD/Cache/Editor/FMODStudioCache.asset
#   Vrij II/Assets/Scripts/Weapon Scripts/Shoot.cs
#   Vrij II/fmod_editor.log
```
  7f969270
- finished wave spawner · a2dba5af
  Jacco Verhoeckx authored 3 years ago
  
  a2dba5af
- Merge branch 'prototype' into 'develop' · 456efe74
  Joey Docter authored 3 years ago
```
Prototype

See merge request !43
```
  456efe74
- fixed bug to sacrifice · fc902a74
  Joey Docter authored 3 years ago
  
  fc902a74
- better feedback added · e8836a03
  Joey Docter authored 3 years ago
  
  e8836a03
- set animations · c4a4badc
  Joey Docter authored 3 years ago
  
  c4a4badc
- Merge branch 'Jesse' into 'develop' · 27cca7f3
  Joey Docter authored 3 years ago
```
animatie toegevoegd in Unity (zie art scene)

See merge request !42
```
  27cca7f3
- Merge branch 'develop' into 'Jesse' · 0fb5c319
  Joey Docter authored 3 years ago
```
# Conflicts:
#   Vrij II/Assets/Plugins/FMOD/Cache/Editor/FMODStudioCache.asset
#   Vrij II/fmod_editor.log
```
  0fb5c319
Jun 11, 2022
- $JESSE\jesse's avatar$
  
  animatie toegevoegd in Unity (zie art scene) · 770321c1
  JESSE\jesse authored 3 years ago
  
  770321c1

Admin message