feature/showcase_bugfixing_kathi_partII #16

Merged
Jonathan merged 33 commits from feature/showcase_bugfixing_kathi_partII into develop 6 months ago

33 Commits (develop)

Author SHA1 Message Date
Katharina Ziolkowski d6a2b586e4 🐛 fixed ducks counting bug
7 months ago
Katharina Ziolkowski 936983e14f 💄 updated dialogic style to make it clearer who is talking and have vesna always on the left side
7 months ago
Katharina Ziolkowski e73f13d7d4 🎨 💄 Created art template for farm plants and reworked existing plant prefabs and inventory resources
7 months ago
Katharina Ziolkowski 0713e334b3 Fixed InventoryInstance behaviour
7 months ago
Katharina Ziolkowski c56f654751 Set up second garden with beetroot, built transition from yard and back
7 months ago
Katharina Ziolkowski 1f88f9b4b5 Added beetroot as growable plant
7 months ago
Katharina Ziolkowski 06fd80f762 grass layering fix
7 months ago
Katharina Ziolkowski 2cb605261e Fixed Tomato farming (again)
7 months ago
Katharina Ziolkowski 975dd45c94 fixed item repository bug
7 months ago
Katharina Ziolkowski d1a8ff0cbf WIP reworking the item repository
7 months ago
Katharina Ziolkowski 9f50e1d293 WIP trying to implement pickup sounds
8 months ago
Katharina Ziolkowski 652cac4232 Added typing sounds to dialogic characters
8 months ago
Katharina Ziolkowski e44e06bace Added Footsteps SFX
8 months ago
Katharina Ziolkowski 89313fd484 Merge remote-tracking branch 'origin/Nao's-Sounds' into feature/showcase_bugfixing_kathi_partII
8 months ago
Nao 6f340b54a4 SFX Footstep Gravel Added
8 months ago
Nao 8f3be823a4 Added Single Footstep SFX, added folders and moved files for better organization
8 months ago
Katharina Ziolkowski eeb56fd7ad Added possibility to deactivate an interactionarea if there is no more timelines to play
8 months ago
Katharina Ziolkowski 871e1856f1 Tools get deactivated from animation when switching to an empty slot in the inventory. Also fixed layering (AGAIN)
8 months ago
Katharina Ziolkowski 378bf45c49 Implemented PR feedback + made sure initial farming quests run smoothly
8 months ago
Katharina Ziolkowski f6e0c4e615 minor scene fixes
8 months ago
Katharina Ziolkowski 6ae877f2ab Implemented first version of an interactable area that reacts to inventory selection
8 months ago
Katharina Ziolkowski 3913143892 Added Hotkey-Info to inventory prefab
8 months ago
Katharina Ziolkowski 4734ae953c Added option to play pickup animation for non-inventory items
8 months ago
Katharina Ziolkowski 5992c390ee Reinstated plantgrowing animation
8 months ago
Katharina Ziolkowski 283caf282b Added interaction on mouse click
8 months ago
Katharina Ziolkowski 7c03964d33 changed watering can display to slider
8 months ago
Katharina Ziolkowski 36c948f116 re-added watering animation and vfx
8 months ago
Katharina Ziolkowski d0ba4076b3 planting, growing and watering a little less dependent than before
8 months ago
Katharina Ziolkowski 7fd26ffed3 Fixed tomato farming again
8 months ago
Katharina Ziolkowski ce2d7eb773 WIP moving seed to plant matching into separate system, making fields independent of specific plants.
8 months ago
Katharina Ziolkowski 41365fb5d4 Fixed tool animation
8 months ago
Katharina Ziolkowski 96c7d35aa7 Added word wrapping to quest post it.
8 months ago
Katharina Ziolkowski c2f5359d0c changes after develop merge
8 months ago