Jonathan
/
Babushka
2
0
Fork 0
Code Pull Requests 3 Releases Activity
517 Commits
46 Branches
0 Tags
4.3 GiB
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '6deb6e29fd'
${ noResults }
Commit Graph

208 Commits (6deb6e29fd5cfccee6d137426fd2c04ccd12361d)

Author SHA1 Message Date
kziolkowski 90b8dda16a Merge branch 'feature/dialogic_style_rework' into feature/detection_cross
3 months ago
kziolkowski 2d4e853ec8 🍱 Adjusted colliders in farm_outside scene and reactivated ground collider on Vesna
3 months ago
kziolkowski 8f097de476 📝🔥🔨
3 months ago
kziolkowski 109573fb1b 🎨 Exchanged Quest post it with ui sprite
3 months ago
kziolkowski 0e55394699 🚧 WIP first setup completed (still buggy!)
3 months ago
kziolkowski e73f13d7d4 🎨 💄 Created art template for farm plants and reworked existing plant prefabs and inventory resources
4 months ago
kziolkowski c56f654751 Set up second garden with beetroot, built transition from yard and back
4 months ago
kziolkowski 1f88f9b4b5 Added beetroot as growable plant
4 months ago
kziolkowski 2cb605261e Fixed Tomato farming (again)
4 months ago
kziolkowski d1a8ff0cbf WIP reworking the item repository
4 months ago
kziolkowski 9f50e1d293 WIP trying to implement pickup sounds
5 months ago
kziolkowski 652cac4232 Added typing sounds to dialogic characters
5 months ago
kziolkowski e44e06bace Added Footsteps SFX
5 months ago
kziolkowski eeb56fd7ad Added possibility to deactivate an interactionarea if there is no more timelines to play
5 months ago
kziolkowski 871e1856f1 Tools get deactivated from animation when switching to an empty slot in the inventory. Also fixed layering (AGAIN)
5 months ago
kziolkowski 378bf45c49 Implemented PR feedback + made sure initial farming quests run smoothly
5 months ago
kziolkowski f6e0c4e615 minor scene fixes
5 months ago
kziolkowski 6ae877f2ab Implemented first version of an interactable area that reacts to inventory selection
5 months ago
kziolkowski 3913143892 Added Hotkey-Info to inventory prefab
5 months ago
kziolkowski 4734ae953c Added option to play pickup animation for non-inventory items
5 months ago
kziolkowski 5992c390ee Reinstated plantgrowing animation
5 months ago
kziolkowski 7c03964d33 changed watering can display to slider
5 months ago
kziolkowski 36c948f116 re-added watering animation and vfx
5 months ago
kziolkowski 7fd26ffed3 Fixed tomato farming again
5 months ago
kziolkowski ce2d7eb773 WIP moving seed to plant matching into separate system, making fields independent of specific plants.
5 months ago
kziolkowski 41365fb5d4 Fixed tool animation
5 months ago
kziolkowski 96c7d35aa7 Added word wrapping to quest post it.
5 months ago
kziolkowski c2f5359d0c changes after develop merge
5 months ago
jonathan 6e998810b6 Completed first demo quest line
5 months ago
Jonathan d7ac1c6c22 Fixed retrigger yeli dialog
5 months ago
Jonathan 0170a53b5a Added more quest stuff including dialogic quest condition
5 months ago
cblech abc33fd06c Added first quests
5 months ago
kziolkowski 0008b16d48 Adjusted moving values and animations to make vesna not slide any more
5 months ago
kziolkowski 8e0dced918 Vesna can walk diagonally now
5 months ago
kziolkowski b69191e7f7 fixed pickup layering
5 months ago
kziolkowski 8f75b5b644 Added secondary outline mat and assigned it to inventory items
5 months ago
kziolkowski 6275bea52c MAde Vesna and Yeli disappear on dialogic start
5 months ago
kziolkowski e88ba2e1ef Updated interaction area setups to avoid nullrefs
5 months ago
kziolkowski cfe604d3b7 set duck body scale to 1,1
5 months ago
kziolkowski ad16b86171 wip exchanging interaction label with outline
6 months ago
kziolkowski ab23d41496 Fixed ysorting on ducks and trash
6 months ago
kziolkowski 486cfb5546 WIP trying to fix the last plant stage bug on repeated farming rounds
6 months ago
kziolkowski d2c7302ab2 Fixed farming (the way it was before)
6 months ago
kziolkowski a4f9511892 WIP fixing farming mechanic again
6 months ago
kziolkowski 7a3e96d679 Merge remote-tracking branch 'origin/feature/fight_system' into feature/showcase_kathi
6 months ago
kziolkowski e38c391e1c Reworked flow to make it playable somehow
6 months ago
cblech e8850ca7c5 Added chuga dialog to fight scene
6 months ago
kziolkowski eaedf8c396 WIP Beetroot
6 months ago
kziolkowski ffa20bbdf8 Added trash to first outdoor scene
6 months ago
cblech 69cb63ad89 merge auto fixes
6 months ago
cblech 11790434f5 Merge remote-tracking branch 'origin/feature/showcase_kathi' into feature/fight_system
6 months ago
cblech 8bd2b09232 Added healing
6 months ago
cblech c6fc400994 Added second fight with mavkha
6 months ago
cblech 0e028a2cb9 Renamed signal
6 months ago
cblech 6727339e9a Added audio to fight
6 months ago
cblech b6fd6292e3 Basic fighting system
6 months ago
kziolkowski 199d0873c8 Set up beetroot quest and added cat to indoor scene.
6 months ago
kziolkowski 202f8809aa Fixed plant layering issue
6 months ago
kziolkowski 28bb81c0b0 Added fence gates and fixed dialogic toggle for inventory
6 months ago
kziolkowski b9c5de6dc3 Made labels visible on ducks
6 months ago
kziolkowski 8c18688a69 MVP duck setup
6 months ago
kziolkowski 6b5a8ee126 WIP duck behaviour
6 months ago
kziolkowski 9e97cc3b80 WIP duck pushing behaviour
6 months ago
kziolkowski ebc3ee9cf9 Implemented basic duck running away from vesna mechanic
6 months ago
kziolkowski 7e6163ed68 updated project.godot
6 months ago
kziolkowski d7ad2ba072 reverted / recreated inventory changes
6 months ago
kziolkowski 9c50a63dc3 Merge branch 'develop' into feature/showcase_kathi
6 months ago
cblech a9cb20c8bc Fixed journal references
6 months ago
cblech 32249fde86 Made quest visuals
6 months ago
cblech 27e137bc02 Made quest usable
6 months ago
cblech 01daddee3b Made basic quest setup
6 months ago
kziolkowski ec653aa847 readded camera ref to farming behaviour
6 months ago
kziolkowski 9acea54f28 Added duck sprite
6 months ago
kziolkowski 2f5296e05a Diversified field shapes
6 months ago
kziolkowski 9c7ae20c18 Reworked Camera controls outside scene
6 months ago
kziolkowski 09ef508f49 Fixed field creation bug
6 months ago
kziolkowski fbad33213c Finalized new watering can mechanic with vfx and ui
6 months ago
kziolkowski 35c7e9a25e WIP Wasserstand UI
6 months ago
kziolkowski 4a0b2cd550 Improved Inventory UI (more in the middle, adapt to viewport size, new selector image)
6 months ago
kziolkowski ba429d7b84 wip improving inventory layout
6 months ago
kziolkowski c36d0b5866 reduced VRAM load by more than 50%
6 months ago
kziolkowski 26cae9b0f8 fixed missing ready plants
7 months ago
kziolkowski f2c492de54 changed label settings for InteractionArea
7 months ago
kziolkowski e269b3ab44 WIP trying to toggle interactable colliders at runtime for fields
7 months ago
kziolkowski 89ae347a91 Added last farming timelines and fixed some minor issues
7 months ago
kziolkowski ddb5547b42 Updated Startscreen and added second tutorial step
7 months ago
kziolkowski afa06d3ee2 Fixed Yeli Y sorting issue and made fields rounded
7 months ago
kziolkowski dd656d5f5f Extended dialogic toggle
7 months ago
kziolkowski b0f4592fdd Added first working timeline for yelis intro to farming scene
7 months ago
kziolkowski 9812006234 Added Yeli sprites and dialogic test timeline as well as prefab
7 months ago
kziolkowski b8e456f7ef moved player2D prefab
7 months ago
kziolkowski 31f19ad139 Code cleanup part 2
7 months ago
kziolkowski c6ec99e87a Project cleanup: Removed 3D scripts and scenes from project. Also renamed and moved some minor stuff.
7 months ago
kziolkowski 1f17cca62d changes from build process
8 months ago
kziolkowski 25d8f217ff basic harvesting implemented
8 months ago
kziolkowski a477f9ef4f Implemented field creation and wateringcan fill up animation
8 months ago
kziolkowski 2c677a8cda Inventory resource rework and slot aspect fix
8 months ago
cblech ec5d42068e fixed generic item on ground and added icon
8 months ago
cblech 8fdb395ae8 Added icon to slot
8 months ago
kziolkowski 60928c520c Inventory implemented
8 months ago