Compare commits
merge into: Jonathan:develop
Jonathan:feature/spine2D_experimental
Jonathan:Nao's-Sounds
Jonathan:develop
Jonathan:Enemy_selection_overlap
Jonathan:feature/build_0_7
Jonathan:feature/farm_fight_loop
Jonathan:feature/bugfixes_polish_II
Jonathan:Vesna_resets_to_bed_after_dead
Jonathan:Vesna_Gesichtsausdrücke_einfügen_
Jonathan:bug/attack_dead_enemy
Jonathan:Kampf_Tooltip
Jonathan:randomise_fight_start
Jonathan:feature/bugfixes_And_Polish
Jonathan:minigame_hit_feedback
Jonathan:minigame_variation
Jonathan:fighting_minigame_fix_overlap_with_Vesna
Jonathan:remove_fightlog
Jonathan:feature/night_to_day
Jonathan:feature/farming_bugfixes_and_magic_word
Jonathan:feature/import_changes
Jonathan:feature/damage_feedback
Jonathan:bug/enemy_group
Jonathan:feature/integrate_new_fight
Jonathan:bug/scene_dependency
Jonathan:feature/dead_squash
Jonathan:bug/enemy_die
Jonathan:Anna
Jonathan:feature/fight_rework
Jonathan:feature/loading_screen
Jonathan:test/music_setup
Jonathan:test/quick_juice
Jonathan:feature/showcase_bugfixing_kathi_partII_quickfix
Jonathan:Animations
Jonathan:feature/implement_quests
Jonathan:feature/languagetool-addon
Jonathan:feature/fight_system
Jonathan:feature_sanel-dialogic
Jonathan:feature/quest_system
Jonathan:inventory
Jonathan:main
Jonathan:level_transition
Jonathan:hint_box
Jonathan:choise_detection
Jonathan:interactions
Jonathan:3d_character_controller
Jonathan:deadend_wwise
pull from: Jonathan:feature/build_0_7
Jonathan:feature/spine2D_experimental
Jonathan:Nao's-Sounds
Jonathan:develop
Jonathan:Enemy_selection_overlap
Jonathan:feature/build_0_7
Jonathan:feature/farm_fight_loop
Jonathan:feature/bugfixes_polish_II
Jonathan:Vesna_resets_to_bed_after_dead
Jonathan:Vesna_Gesichtsausdrücke_einfügen_
Jonathan:bug/attack_dead_enemy
Jonathan:Kampf_Tooltip
Jonathan:randomise_fight_start
Jonathan:feature/bugfixes_And_Polish
Jonathan:minigame_hit_feedback
Jonathan:minigame_variation
Jonathan:fighting_minigame_fix_overlap_with_Vesna
Jonathan:remove_fightlog
Jonathan:feature/night_to_day
Jonathan:feature/farming_bugfixes_and_magic_word
Jonathan:feature/import_changes
Jonathan:feature/damage_feedback
Jonathan:bug/enemy_group
Jonathan:feature/integrate_new_fight
Jonathan:bug/scene_dependency
Jonathan:feature/dead_squash
Jonathan:bug/enemy_die
Jonathan:Anna
Jonathan:feature/fight_rework
Jonathan:feature/loading_screen
Jonathan:test/music_setup
Jonathan:test/quick_juice
Jonathan:feature/showcase_bugfixing_kathi_partII_quickfix
Jonathan:Animations
Jonathan:feature/implement_quests
Jonathan:feature/languagetool-addon
Jonathan:feature/fight_system
Jonathan:feature_sanel-dialogic
Jonathan:feature/quest_system
Jonathan:inventory
Jonathan:main
Jonathan:level_transition
Jonathan:hint_box
Jonathan:choise_detection
Jonathan:interactions
Jonathan:3d_character_controller
Jonathan:deadend_wwise
A pull request between these branches already exists: Jonathan/Babushka#49