Commit Graph

398 Commits

Author SHA1 Message Date
kziolkowski 1094fb2142 Added tool animations to player 2025-05-19 21:17:50 +02:00
cblech 2ab1c38de9 cleaned Inventory ui 2025-05-19 17:17:01 +02:00
Felix Paul 3eb35d4e7d Rerender Harvesting and added Watering animations 2025-05-18 21:22:27 +02:00
Nao 4261789f13 SFX Quest Complete Placeholder added (need more time) 2025-05-18 20:34:00 +02:00
Nao ce18c89c09 Farm Atmos Nighttime added 2025-05-18 19:21:51 +02:00
Nao 7643cccebf New SFX and Forest Atmos Nighttime added 2025-05-18 19:04:02 +02:00
Nao 7e4d733d7c SFX for kitchen added (cutlery, plates, etc) and a few renamed 2025-05-18 17:52:59 +02:00
Nao 1dcd900737 SFX Snoring Added 2025-05-18 15:33:02 +02:00
Nao 74c3540c96 SFX Door Open and Close added 2025-05-18 15:10:08 +02:00
kziolkowski 6d80253d9c import updates to shaders and animations 2025-05-18 13:05:35 +02:00
kziolkowski 1b7c35879c Merge remote-tracking branch 'origin/Animations' into farming_mechanic 2025-05-18 12:34:21 +02:00
kziolkowski ff426b0494 Initial Farming setup complete 2025-05-18 12:32:56 +02:00
kziolkowski 90616537bc Watering fields 2025-05-18 11:44:33 +02:00
kziolkowski 0f8eb244e9 planting / growth works again 2025-05-17 19:04:46 +02:00
kziolkowski 38fdad7690 removed print statements 2025-05-17 18:24:15 +02:00
kziolkowski 0de6bc0c04 the most beautiful grid of fields you can imagine 2025-05-17 18:23:35 +02:00
Felix Paul fc2d6592a2 Added Vesna animations with tools 2025-05-17 17:47:52 +02:00
kziolkowski 222c10fe0a limited field creation to specified shape 2025-05-17 17:40:15 +02:00
kziolkowski 8af825bc18 InteractionAreas are now bound to SpriteSwitchers and farming tool interaction works 2025-05-17 16:38:32 +02:00
kziolkowski f7684b6c2a Deleted unused kenney assets 2025-05-17 14:02:20 +02:00
kziolkowski f9a3a8e389 generated import files for art assets 2025-05-17 13:49:07 +02:00
kziolkowski 6ad8fb00bd imported various art assets from owncloud 2025-05-17 13:47:54 +02:00
kziolkowski c4dbc104d4 music files added 2025-05-17 13:41:42 +02:00
kziolkowski 77c0babdca minor changes after merge 2025-05-17 13:37:56 +02:00
kziolkowski aa5a3483bb Merge remote-tracking branch 'origin/Nao's-Sounds' into farming_mechanic 2025-05-17 13:31:21 +02:00
kziolkowski 68b6031da1 Merge remote-tracking branch 'origin/Animations' into farming_mechanic 2025-05-17 13:30:58 +02:00
kziolkowski 4afb02440c Reworking 2D interactions 2025-05-16 23:16:27 +02:00
Nao de5657a9cd More SFX Added 2025-05-15 19:06:27 +02:00
kziolkowski ff85b67087 Made interaction area 2d work - and farming/growing work again. 2025-05-14 23:12:14 +02:00
Nao 6f3d843818 SFX and Atmos added (with variations) 2025-05-14 19:58:03 +02:00
Felix Paul 20f8eaaebd Added Vesna 2D image sequences 2025-05-14 12:48:37 +02:00
Felix Paul 69848e77c9 Added PickUp and Interact (Back) animations 2025-05-12 17:57:12 +02:00
kziolkowski 366923699c WIP 2D rework 2025-05-12 00:16:13 +02:00
kziolkowski 2a7f39e3fe Adjusted movement and included collider collisions as a constraint to the player 2025-05-11 23:20:35 +02:00
kziolkowski 296fed6e08 Added fields 2025-05-10 16:33:35 +02:00
kziolkowski 1af04631c5 Added 2d outdoor scene with parallaxe and mockup background 2025-05-10 16:29:23 +02:00
Felix Paul 9ec1bcab97 Added 2 animations
Added Fill Watercan and Hold Item animations
2025-05-05 20:24:26 +02:00
kziolkowski d11fc9f1f2 Cleaned up house mockup outline and removed spammy debug log 2025-04-30 18:49:46 +02:00
kziolkowski 16a65f7155 added flat indoor test and skybox to 3d test 2025-04-30 18:43:18 +02:00
kziolkowski 0fcc425ace built first 2d indoor scene + added kitchen 2025-04-30 17:36:38 +02:00
Felix Paul 21685d60d5 Added Vesna animations 2025-04-28 20:15:39 +02:00
kziolkowski 752cdb1502 Added new how sprite 2025-04-27 10:09:11 +02:00
kziolkowski 8299998a0f Added fence to the left part of the farm 2025-04-26 15:15:38 +02:00
kziolkowski 5ea6431216 Added tree prefabs and a forest border around the farm 2025-04-26 14:51:56 +02:00
Felix Paul 7cccd40290 Test
Einige animationen in 3D
2025-04-25 21:19:04 +02:00
kziolkowski 762a694be3 Spawning and watering is now bound to the cursor position (kinda) 2025-04-25 00:13:50 +02:00
kziolkowski 339428c312 Basic watering functionality implemented 2025-04-24 23:36:23 +02:00
kziolkowski 7e19268847 Merge remote-tracking branch 'origin/main' into c_sharp_setup
# Conflicts:
#	scripts/CSharp/Common/CharacterControls/VesnaBehaviour.cs.uid
#	scripts/CSharp/Common/Farming/FieldService.cs.uid
2025-04-24 21:22:56 +02:00
kziolkowski 20b37de108 generated files 2025-04-24 21:22:14 +02:00
kziolkowski 7d1187d218 Merge pull request 'inventory' (#3) from inventory into main
Reviewed-on: #3
Reviewed-by: kziolkowski <katharina.ziolkowski@gmail.com>
2025-04-24 21:18:13 +02:00