Commit Graph

405 Commits (0507f1ee3d835932ba2bc22cc96642e4ba2f25b0)
 

Author SHA1 Message Date
Katharina Ziolkowski 0fc1760b70 Merge pull request 'feature/animations_update' (#17) from feature/animations_update into develop
6 months ago
Katharina Ziolkowski 90b8dda16a Merge branch 'feature/dialogic_style_rework' into feature/detection_cross
6 months ago
Katharina Ziolkowski ecff43d5c3 Merge branch 'develop' into feature/detection_cross
6 months ago
Jonathan 40b8c022fe Merge pull request 'feature/showcase_bugfixing_kathi_partII' (#16) from feature/showcase_bugfixing_kathi_partII into develop
6 months ago
Katharina Ziolkowski e1b1a2f447 🔧 adjusted seed pickup positions and indoor collider sizes
6 months ago
Katharina Ziolkowski 2d4e853ec8 🍱 Adjusted colliders in farm_outside scene and reactivated ground collider on Vesna
6 months ago
Katharina Ziolkowski 8f097de476 📝🔥🔨
6 months ago
Katharina Ziolkowski 109573fb1b 🎨 Exchanged Quest post it with ui sprite
6 months ago
Katharina Ziolkowski 0e55394699 🚧 WIP first setup completed (still buggy!)
6 months ago
Katharina Ziolkowski b1335d4b00 Merge branch 'feature/dialogic_style_rework' into feature/detection_cross
6 months ago
Katharina Ziolkowski 078e26e868 Implemented dialogue box design as described in mockups
6 months ago
Katharina Ziolkowski ffebe10593 💄 Added new fonts and increased textbox size. Also added border line.
6 months ago
Katharina Ziolkowski 4c8406ba97 upgraded project to 4.5
6 months ago
Katharina Ziolkowski 080ebaae47 removed redundant import statement
6 months ago
Katharina Ziolkowski 5cf250b295 Added randomizer class for certain types of EventResources
6 months ago
Katharina Ziolkowski ef56f79d5c Added event payload and Valuechange-handling
6 months ago
Katharina Ziolkowski 5bcbee8865 created test scene and removed event test elements from start scene
6 months ago
Katharina Ziolkowski a74abe684b Godot upgrade to 4.5
6 months ago
Katharina Ziolkowski a593be8273 📝 added documentation and improved event scope
6 months ago
Katharina Ziolkowski 1e004b62b8 Implemented first version of EventResources
6 months ago
Katharina Ziolkowski 5fc7b3d563 scene updates after undoing changes to interactionArea
6 months ago
Katharina Ziolkowski d4892e1aa4 sound autoimports
6 months ago
Katharina Ziolkowski e0ea5ef5be Merge branch 'feature/sounds_update' into feature/bugfixing_kathi_partIII
6 months ago
Katharina Ziolkowski 02ff401273 Merge branch 'feature/animations_update' into feature/bugfixing_kathi_partIII
6 months ago
Katharina Ziolkowski c3e78b5db2 Merge remote-tracking branch 'origin/Nao's-Sounds' into feature/sounds_update
6 months ago
Katharina Ziolkowski 09b2baab0a Merge remote-tracking branch 'origin/Animations' into feature/animations_update
6 months ago
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
Nao cba6c09ca0 SFX for Wolf added + redone reverb of footsteps (but not sure it worked?! - possible new upload/replacement possible)
7 months ago
Felix Paul da7cd2f6f2 Small update
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