Commit Graph

72 Commits (afa06d3ee2bcf207f6ad8cba0dfdcac40d92d702)

Author SHA1 Message Date
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