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

214 Commits (feature/spine2D_experimental)

Author SHA1 Message Date
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
kziolkowski ee897db52b added swaying plants shader
8 months ago
kziolkowski 267172d026 WIP adding the inventory, also state after first clip
8 months ago
kziolkowski 917e6a5f7e Merge remote-tracking branch 'origin/inventory' into feature/farming_visuals
8 months ago
kziolkowski 23ef4e9a63 changed visibility order for plants
8 months ago
kziolkowski fa7cc66748 added farming animation mechanic
8 months ago
cblech 7b006d19ef Changed slot visuals
8 months ago
kziolkowski ad070514d7 Added item and interact animations
8 months ago
kziolkowski 80c48ea3df added pickup animation
8 months ago
kziolkowski 7276bdda38 Watering can animation plays when watering
8 months ago
kziolkowski 73dc3063c0 removed unnecessary icons from farming controls
8 months ago
cblech 9a5caef52f Added inventory background and fixes
8 months ago
kziolkowski 1094fb2142 Added tool animations to player
8 months ago
cblech 2ab1c38de9 cleaned Inventory ui
8 months ago
kziolkowski ff426b0494 Initial Farming setup complete
8 months ago
kziolkowski 90616537bc Watering fields
8 months ago
kziolkowski 0f8eb244e9 planting / growth works again
8 months ago
kziolkowski 8af825bc18 InteractionAreas are now bound to SpriteSwitchers and farming tool interaction works
8 months ago
kziolkowski 77c0babdca minor changes after merge
8 months ago
kziolkowski 4afb02440c Reworking 2D interactions
8 months ago
kziolkowski ff85b67087 Made interaction area 2d work - and farming/growing work again.
8 months ago
kziolkowski 366923699c WIP 2D rework
8 months ago
kziolkowski 2a7f39e3fe Adjusted movement and included collider collisions as a constraint to the player
8 months ago
kziolkowski 1af04631c5 Added 2d outdoor scene with parallaxe and mockup background
8 months ago
kziolkowski 0fcc425ace built first 2d indoor scene + added kitchen
9 months ago
kziolkowski 752cdb1502 Added new how sprite
9 months ago
kziolkowski 8299998a0f Added fence to the left part of the farm
9 months ago
kziolkowski 5ea6431216 Added tree prefabs and a forest border around the farm
9 months ago
kziolkowski 762a694be3 Spawning and watering is now bound to the cursor position (kinda)
9 months ago
kziolkowski 339428c312 Basic watering functionality implemented
9 months ago
kziolkowski 7e19268847 Merge remote-tracking branch 'origin/main' into c_sharp_setup
9 months ago
cblech fb0c14c3f1 Added item stacking
9 months ago
kziolkowski c73d3ff370 Reworked the fieldservice
9 months ago
cblech e99b574d1f Added pickup error text
9 months ago
cblech 1062193785 item on ground and pickup
9 months ago
kziolkowski c200098f0c WIP reworking the field behaviour to implement watering. Broken state.
9 months ago
kziolkowski 0e775309fb Scene changes
9 months ago
kziolkowski 5db71adf03 Fields spawn on a grid
9 months ago
kziolkowski ce5d2b65d3 Separated farming controls from vesna behvaiour and adjusted the setup
9 months ago
kziolkowski b5dcad5614 Vesna walking and idle animations work for all movement directions.
9 months ago
cblech 8c1822557c Added Inventory into babushka farming scene
9 months ago
cblech dacf48b9fd Merge remote-tracking branch 'origin/c_sharp_setup' into inventory
9 months ago
cblech daa53e4aef Added slot select
9 months ago
cblech 77591425cb removed unused slots script
9 months ago
cblech 667ef6fb9b Added open close inventory
9 months ago
cblech c90687939c Move items
9 months ago
kziolkowski 8622f2d38d Added vesna animations
9 months ago
kziolkowski bd4f7edc20 Creating new plantable fields works
9 months ago
kziolkowski 45a58f701b Spawning fields works
9 months ago
kziolkowski f08f3a7978 Fixed Pickup behaviour
9 months ago
kziolkowski 26502f2d37 old style farming works again
9 months ago
kziolkowski a9b1c179cd folder refactoring, plant_base adjustments
9 months ago
kziolkowski d144f5c0c4 Added Sprite Swap and Horizontal flipping to character controller
9 months ago
kziolkowski 45d09cd618 Farming part I
9 months ago
kziolkowski f2902ad7c1 added 2d and 3d house prototypes
10 months ago
kziolkowski 7f8b444270 Translated Player Scripts from GDScript to C#
10 months ago
kziolkowski d4b7c0bf45 Translated some scripts from GDscript to C#
10 months ago
cblech 959ab68b4d Added basic inventory system
10 months ago
kziolkowski 4f312209b3 a bit of restructuring, renaming, and c sharp setup
10 months ago