Jonathan
/
Babushka
2
0
Fork 0
Code Pull Requests 1 Releases Activity
573 Commits
46 Branches
0 Tags
5.7 GiB
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'develop'
${ noResults }
Commit Graph

230 Commits (develop)

Author SHA1 Message Date
Katharina Ziolkowski fe1dd2bcc1 ✨ Added inventorylistener for watering can
5 months ago
Katharina Ziolkowski 6e833a0735 ✨ added InventoryListener and made field interaction area activate only when the right item (seed) is in the inventory
5 months ago
Katharina Ziolkowski c52bfc8017 🐛 fixed field outline
5 months ago
Katharina Ziolkowski 58c2be1db8 ✨ plants no longer grow when just interacting with them
5 months ago
Katharina Ziolkowski c7c6e184d6 🐛 adjusted field positions
5 months ago
Katharina Ziolkowski 6a2355cf97 🐛 fixed never more than 10 fields bug
5 months ago
Katharina Ziolkowski 8b77ca9bc5 ♻️ migrated the InteractionAreas currently used to the new format and removed the old code
5 months ago
Katharina Ziolkowski 66848af8bf Merge branch 'develop' into feature/farming_bugfixes_and_magic_word
5 months ago
jonathan f27f69c15f 🐛 Rebase fixing
5 months ago
jonathan 83dc6bfd56 ♻️ Implemented FightersFormation to keep track of the fight entered state of the fighters
5 months ago
jonathan 0de3bcae22 ♻️Code cleanup
5 months ago
jonathan 83c9dfc945 ✨Added theme-based region colors
5 months ago
jonathan cd235248c6 ✨Added minigame label for each region
5 months ago
jonathan 8624e2aea8 Added minigame
5 months ago
jonathan 1f227f70a7 Added basic health bar
5 months ago
jonathan 0e315396c9 Made fight fightable
5 months ago
jonathan f27dd199b8 Fight happening base setup
5 months ago
jonathan fd0e631b1f Bootstrap fight system
5 months ago
Katharina Ziolkowski 6ba26c360d 🚧 reworking Fieldservice
5 months ago
Katharina Ziolkowski 63fd81e54d 🔥 removed no longer needed scene call group
5 months ago
Katharina Ziolkowski b54f784d51 🎨 Replaced pickup animation group call with event
5 months ago
Katharina Ziolkowski 6194988bf0 🎨 removed plant growing call group and replaced it with an event call. Made FarmingAnimation play on event.
5 months ago
Katharina Ziolkowski 90b8dda16a Merge branch 'feature/dialogic_style_rework' into feature/detection_cross
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 e73f13d7d4 🎨 💄 Created art template for farm plants and reworked existing plant prefabs and inventory resources
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 2cb605261e Fixed Tomato farming (again)
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 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 7c03964d33 changed watering can display to slider
8 months ago
Katharina Ziolkowski 36c948f116 re-added watering animation and vfx
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
jonathan 6e998810b6 Completed first demo quest line
8 months ago
Jonathan d7ac1c6c22 Fixed retrigger yeli dialog
8 months ago
Jonathan 0170a53b5a Added more quest stuff including dialogic quest condition
8 months ago
cblech abc33fd06c Added first quests
8 months ago
Katharina Ziolkowski 0008b16d48 Adjusted moving values and animations to make vesna not slide any more
8 months ago
Katharina Ziolkowski 8e0dced918 Vesna can walk diagonally now
8 months ago
Katharina Ziolkowski b69191e7f7 fixed pickup layering
8 months ago
Katharina Ziolkowski 8f75b5b644 Added secondary outline mat and assigned it to inventory items
8 months ago
Katharina Ziolkowski 6275bea52c MAde Vesna and Yeli disappear on dialogic start
8 months ago
Katharina Ziolkowski e88ba2e1ef Updated interaction area setups to avoid nullrefs
8 months ago
Katharina Ziolkowski cfe604d3b7 set duck body scale to 1,1
9 months ago
Katharina Ziolkowski ad16b86171 wip exchanging interaction label with outline
9 months ago
Katharina Ziolkowski ab23d41496 Fixed ysorting on ducks and trash
9 months ago
Katharina Ziolkowski 486cfb5546 WIP trying to fix the last plant stage bug on repeated farming rounds
9 months ago
Katharina Ziolkowski d2c7302ab2 Fixed farming (the way it was before)
9 months ago
Katharina Ziolkowski a4f9511892 WIP fixing farming mechanic again
9 months ago
Katharina Ziolkowski 7a3e96d679 Merge remote-tracking branch 'origin/feature/fight_system' into feature/showcase_kathi
9 months ago
Katharina Ziolkowski e38c391e1c Reworked flow to make it playable somehow
9 months ago
cblech e8850ca7c5 Added chuga dialog to fight scene
9 months ago
Katharina Ziolkowski eaedf8c396 WIP Beetroot
9 months ago
Katharina Ziolkowski ffa20bbdf8 Added trash to first outdoor scene
9 months ago
cblech 69cb63ad89 merge auto fixes
9 months ago
cblech 11790434f5 Merge remote-tracking branch 'origin/feature/showcase_kathi' into feature/fight_system
9 months ago
cblech 8bd2b09232 Added healing
9 months ago
cblech c6fc400994 Added second fight with mavkha
9 months ago
cblech 0e028a2cb9 Renamed signal
9 months ago
cblech 6727339e9a Added audio to fight
9 months ago
cblech b6fd6292e3 Basic fighting system
9 months ago
Katharina Ziolkowski 199d0873c8 Set up beetroot quest and added cat to indoor scene.
9 months ago
Katharina Ziolkowski 202f8809aa Fixed plant layering issue
9 months ago
Katharina Ziolkowski 28bb81c0b0 Added fence gates and fixed dialogic toggle for inventory
9 months ago
Katharina Ziolkowski b9c5de6dc3 Made labels visible on ducks
9 months ago
Katharina Ziolkowski 8c18688a69 MVP duck setup
9 months ago
Katharina Ziolkowski 6b5a8ee126 WIP duck behaviour
9 months ago
Katharina Ziolkowski 9e97cc3b80 WIP duck pushing behaviour
9 months ago
Katharina Ziolkowski ebc3ee9cf9 Implemented basic duck running away from vesna mechanic
9 months ago
Katharina Ziolkowski 7e6163ed68 updated project.godot
9 months ago
Katharina Ziolkowski d7ad2ba072 reverted / recreated inventory changes
9 months ago
Katharina Ziolkowski 9c50a63dc3 Merge branch 'develop' into feature/showcase_kathi
9 months ago
cblech a9cb20c8bc Fixed journal references
9 months ago
cblech 32249fde86 Made quest visuals
9 months ago
cblech 27e137bc02 Made quest usable
9 months ago
cblech 01daddee3b Made basic quest setup
9 months ago
Katharina Ziolkowski ec653aa847 readded camera ref to farming behaviour
9 months ago
Katharina Ziolkowski 9acea54f28 Added duck sprite
9 months ago
Katharina Ziolkowski 2f5296e05a Diversified field shapes
9 months ago
Katharina Ziolkowski 9c7ae20c18 Reworked Camera controls outside scene
9 months ago
Katharina Ziolkowski 09ef508f49 Fixed field creation bug
9 months ago
Katharina Ziolkowski fbad33213c Finalized new watering can mechanic with vfx and ui
9 months ago
Katharina Ziolkowski 35c7e9a25e WIP Wasserstand UI
9 months ago