1. 21 Sep, 2019 40 commits
    • Games@thm's avatar
      Merge remote-tracking branch 'origin/master' · a4efffcb
      Games@thm authored
      a4efffcb
    • Games@thm's avatar
      audiotweaks · a709e212
      Games@thm authored
      a709e212
    • M-e-e's avatar
      Merge remote-tracking branch 'origin/master' · 00bf6cb6
      M-e-e authored
      00bf6cb6
    • M-e-e's avatar
      Animation? · 84627d6d
      M-e-e authored
      84627d6d
    • Skydiver3's avatar
      Merge branch 'master' of... · ccaa1d43
      Skydiver3 authored
      Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/best-enemies-forever
      ccaa1d43
    • Skydiver3's avatar
      menus · e7d7e89a
      Skydiver3 authored
      e7d7e89a
    • M-e-e's avatar
      Animation? · 6bab85eb
      M-e-e authored
      6bab85eb
    • M-e-e's avatar
      Merge remote-tracking branch 'origin/master' · 91c8d9e4
      M-e-e authored
      # Conflicts:
      #	Assets/_Game/Prefabs/PickUps/Collectable.prefab
      91c8d9e4
    • M-e-e's avatar
      Animation? · 4c8e5c1b
      M-e-e authored
      4c8e5c1b
    • Games@thm's avatar
      Merge remote-tracking branch 'origin/master' · f9f88b90
      Games@thm authored
      f9f88b90
    • Games@thm's avatar
      audiotweaks · 81478cd4
      Games@thm authored
      81478cd4
    • Skydiver3's avatar
      Merge branch 'master' of... · 96db84e1
      Skydiver3 authored
      Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/best-enemies-forever
      96db84e1
    • Skydiver3's avatar
      menus · 24409bf8
      Skydiver3 authored
      24409bf8
    • M-e-e's avatar
      Merge remote-tracking branch 'origin/master' · 4e43647f
      M-e-e authored
      4e43647f
    • M-e-e's avatar
      Animation · 24bf6237
      M-e-e authored
      24bf6237
    • Leona Kirchem's avatar
      some main menu changes · b02760a2
      Leona Kirchem authored
      b02760a2
    • Games@thm's avatar
      Merge remote-tracking branch 'origin/master' · 8531a37b
      Games@thm authored
      8531a37b
    • Games@thm's avatar
      audiotweaks · ab7c0ba9
      Games@thm authored
      ab7c0ba9
    • M-e-e's avatar
      Merge remote-tracking branch 'origin/master' · d2dfc299
      M-e-e authored
      d2dfc299
    • M-e-e's avatar
      Animation · da4c7b05
      M-e-e authored
      da4c7b05
    • Skydiver3's avatar
      menus · 6ccc1cbf
      Skydiver3 authored
      6ccc1cbf
    • Skydiver3's avatar
      menus · 6d53a0be
      Skydiver3 authored
      6d53a0be
    • Skydiver3's avatar
      Merge remote-tracking branch 'origin/master' · 47be8bd7
      Skydiver3 authored
      # Conflicts:
      #	Assets/_Game/Scenes/MainMenu_Tests/MainMenu.unity
      47be8bd7
    • Skydiver3's avatar
      menus · 0cc2b222
      Skydiver3 authored
      0cc2b222
    • M-e-e's avatar
      Merge remote-tracking branch 'origin/master' · b23dc49d
      M-e-e authored
      b23dc49d
    • M-e-e's avatar
      Touching Fixed · b1773ebf
      M-e-e authored
      b1773ebf
    • Leona Kirchem's avatar
      4a7ca396
    • Leona Kirchem's avatar
      some main menu changes · b1f44bad
      Leona Kirchem authored
      b1f44bad
    • Skydiver3's avatar
      Merge branch 'master' of... · 3757361b
      Skydiver3 authored
      Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/best-enemies-forever
      3757361b
    • Skydiver3's avatar
      menus · dc2f4608
      Skydiver3 authored
      dc2f4608
    • Games@thm's avatar
      Merge remote-tracking branch 'origin/master' · e0eeb3c4
      Games@thm authored
      e0eeb3c4
    • Games@thm's avatar
      audiotweaks · 77fc1644
      Games@thm authored
      77fc1644
    • M-e-e's avatar
      Merge remote-tracking branch 'origin/master' · 8fa8b7c4
      M-e-e authored
      8fa8b7c4
    • M-e-e's avatar
      Death Dialog Fixed · f0c6aa2f
      M-e-e authored
      f0c6aa2f
    • Leona Kirchem's avatar
      some main menu changes · 9525f135
      Leona Kirchem authored
      9525f135
    • Games@thm's avatar
      audiosachen · 2c5104cd
      Games@thm authored
      2c5104cd
    • M-e-e's avatar
      "SAVE PROJECT" is important! · 9546db5b
      M-e-e authored
      9546db5b
    • M-e-e's avatar
      Merge remote-tracking branch 'origin/master' · e4b8eef9
      M-e-e authored
      # Conflicts:
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-10.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-11.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-12.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-13.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-14.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-15.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-16.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-17.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-18.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-19.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-2.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-20.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-21.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-22.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-23.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-24.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-25.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-26.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-27.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-28.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-29.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-3.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-30.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-31.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-32.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-33.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-34.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-35.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-36.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-37.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-38.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-39.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-4.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-40.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-41.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-42.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-5.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-6.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-7.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-8.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur-9.wav.meta
      #	Assets/_Game/Audio/VoiceOver/WAV/OnDeathVoice/Tonspur.wav.meta
      e4b8eef9
    • M-e-e's avatar
      DialogSystem DOOOOOONE BABY · f9903c51
      M-e-e authored
      f9903c51
    • Games@thm's avatar
      audiosachen · babb4c5e
      Games@thm authored
      babb4c5e