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

153 Commits (ffebe10593f1e966eb0254755d5d51caae642654)

Author SHA1 Message Date
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
Katharina Ziolkowski 4a0b2cd550 Improved Inventory UI (more in the middle, adapt to viewport size, new selector image)
9 months ago
Katharina Ziolkowski ba429d7b84 wip improving inventory layout
9 months ago
Katharina Ziolkowski c36d0b5866 reduced VRAM load by more than 50%
9 months ago
Katharina Ziolkowski 26cae9b0f8 fixed missing ready plants
10 months ago
Katharina Ziolkowski f2c492de54 changed label settings for InteractionArea
10 months ago
Katharina Ziolkowski e269b3ab44 WIP trying to toggle interactable colliders at runtime for fields
10 months ago
Katharina Ziolkowski 89ae347a91 Added last farming timelines and fixed some minor issues
10 months ago
Katharina Ziolkowski ddb5547b42 Updated Startscreen and added second tutorial step
10 months ago
Katharina Ziolkowski afa06d3ee2 Fixed Yeli Y sorting issue and made fields rounded
10 months ago
Katharina Ziolkowski dd656d5f5f Extended dialogic toggle
10 months ago
Katharina Ziolkowski b0f4592fdd Added first working timeline for yelis intro to farming scene
10 months ago
Katharina Ziolkowski 9812006234 Added Yeli sprites and dialogic test timeline as well as prefab
10 months ago
Katharina Ziolkowski b8e456f7ef moved player2D prefab
10 months ago
Katharina Ziolkowski 31f19ad139 Code cleanup part 2
10 months ago
Katharina Ziolkowski c6ec99e87a Project cleanup: Removed 3D scripts and scenes from project. Also renamed and moved some minor stuff.
10 months ago
Katharina Ziolkowski 1f17cca62d changes from build process
11 months ago
Katharina Ziolkowski 25d8f217ff basic harvesting implemented
11 months ago
Katharina Ziolkowski a477f9ef4f Implemented field creation and wateringcan fill up animation
11 months ago
Katharina Ziolkowski 2c677a8cda Inventory resource rework and slot aspect fix
11 months ago
cblech ec5d42068e fixed generic item on ground and added icon
11 months ago
cblech 8fdb395ae8 Added icon to slot
11 months ago
Katharina Ziolkowski 60928c520c Inventory implemented
11 months ago
Katharina Ziolkowski ee897db52b added swaying plants shader
11 months ago
Katharina Ziolkowski 267172d026 WIP adding the inventory, also state after first clip
11 months ago
Katharina Ziolkowski 917e6a5f7e Merge remote-tracking branch 'origin/inventory' into feature/farming_visuals
11 months ago
Katharina Ziolkowski 23ef4e9a63 changed visibility order for plants
11 months ago
Katharina Ziolkowski fa7cc66748 added farming animation mechanic
11 months ago
cblech 7b006d19ef Changed slot visuals
11 months ago
Katharina Ziolkowski ad070514d7 Added item and interact animations
11 months ago
Katharina Ziolkowski 80c48ea3df added pickup animation
11 months ago
Katharina Ziolkowski 7276bdda38 Watering can animation plays when watering
11 months ago
Katharina Ziolkowski 73dc3063c0 removed unnecessary icons from farming controls
11 months ago
cblech 9a5caef52f Added inventory background and fixes
11 months ago
Katharina Ziolkowski 1094fb2142 Added tool animations to player
11 months ago
cblech 2ab1c38de9 cleaned Inventory ui
11 months ago
Katharina Ziolkowski ff426b0494 Initial Farming setup complete
11 months ago
Katharina Ziolkowski 90616537bc Watering fields
11 months ago
Katharina Ziolkowski 0f8eb244e9 planting / growth works again
11 months ago
Katharina Ziolkowski 8af825bc18 InteractionAreas are now bound to SpriteSwitchers and farming tool interaction works
11 months ago
Katharina Ziolkowski 77c0babdca minor changes after merge
11 months ago
Katharina Ziolkowski 4afb02440c Reworking 2D interactions
11 months ago
Katharina Ziolkowski ff85b67087 Made interaction area 2d work - and farming/growing work again.
11 months ago
Katharina Ziolkowski 366923699c WIP 2D rework
11 months ago
Katharina Ziolkowski 2a7f39e3fe Adjusted movement and included collider collisions as a constraint to the player
11 months ago
Katharina Ziolkowski 1af04631c5 Added 2d outdoor scene with parallaxe and mockup background
11 months ago
Katharina Ziolkowski 0fcc425ace built first 2d indoor scene + added kitchen
12 months ago
Katharina Ziolkowski 752cdb1502 Added new how sprite
12 months ago
Katharina Ziolkowski 8299998a0f Added fence to the left part of the farm
12 months ago
Katharina Ziolkowski 5ea6431216 Added tree prefabs and a forest border around the farm
12 months ago
Katharina Ziolkowski 762a694be3 Spawning and watering is now bound to the cursor position (kinda)
12 months ago
Katharina Ziolkowski 339428c312 Basic watering functionality implemented
12 months ago
Katharina Ziolkowski 7e19268847 Merge remote-tracking branch 'origin/main' into c_sharp_setup
12 months ago
cblech fb0c14c3f1 Added item stacking
1 year ago
Katharina Ziolkowski c73d3ff370 Reworked the fieldservice
1 year ago
cblech e99b574d1f Added pickup error text
1 year ago
cblech 1062193785 item on ground and pickup
1 year ago
Katharina Ziolkowski c200098f0c WIP reworking the field behaviour to implement watering. Broken state.
1 year ago
Katharina Ziolkowski 0e775309fb Scene changes
1 year ago
Katharina Ziolkowski 5db71adf03 Fields spawn on a grid
1 year ago
Katharina Ziolkowski ce5d2b65d3 Separated farming controls from vesna behvaiour and adjusted the setup
1 year ago
Katharina Ziolkowski b5dcad5614 Vesna walking and idle animations work for all movement directions.
1 year ago
cblech 8c1822557c Added Inventory into babushka farming scene
1 year ago
cblech dacf48b9fd Merge remote-tracking branch 'origin/c_sharp_setup' into inventory
1 year ago
cblech daa53e4aef Added slot select
1 year ago
cblech 77591425cb removed unused slots script
1 year ago
cblech 667ef6fb9b Added open close inventory
1 year ago
cblech c90687939c Move items
1 year ago
Katharina Ziolkowski 8622f2d38d Added vesna animations
1 year ago
Katharina Ziolkowski bd4f7edc20 Creating new plantable fields works
1 year ago
Katharina Ziolkowski 45a58f701b Spawning fields works
1 year ago
Katharina Ziolkowski f08f3a7978 Fixed Pickup behaviour
1 year ago
Katharina Ziolkowski 26502f2d37 old style farming works again
1 year ago
Katharina Ziolkowski a9b1c179cd folder refactoring, plant_base adjustments
1 year ago
Katharina Ziolkowski d144f5c0c4 Added Sprite Swap and Horizontal flipping to character controller
1 year ago
Katharina Ziolkowski 45d09cd618 Farming part I
1 year ago
Katharina Ziolkowski f2902ad7c1 added 2d and 3d house prototypes
1 year ago
Katharina Ziolkowski 7f8b444270 Translated Player Scripts from GDScript to C#
1 year ago