Commit Graph

74 Commits (89ae347a91485b95343e718e0e7c468373c3d5cf)

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