 Katharina Ziolkowski
|
0dfbd73978
|
Reverted ItemOnGround to make everything compile again
|
2026-02-03 17:59:38 +01:00 |
|
|
Katharina Ziolkowski
|
8a93b00e72
|
Merge branch 'develop' into feature/entity_rework
# Conflicts:
# scenes/scene_credits.tscn
# scenes/scene_farm_outside_2d.tscn
# scenes/scene_fight_world_room.tscn
# scenes/scene_indoor_vesnas_room.tscn
# scenes/scene_outside_beets.tscn
# scripts/CSharp/Common/Farming/PlantBehaviour2D.cs
|
2026-02-03 17:53:28 +01:00 |
|
|
Katharina Ziolkowski
|
bcbc074c86
|
First adjustments to the Entity System to make it work with different types
|
2026-02-03 13:55:13 +01:00 |
|
 jonathan
|
745f54b375
|
WIP
|
2026-01-29 17:42:32 +01:00 |
|
 kziolkowski
|
b0ee8c4c58
|
fixed path strings in scene transitions and added disclaimer and credits back into the flow
|
2025-12-17 01:07:39 +01:00 |
|
|
kziolkowski
|
522fdfa365
|
Added fightworld background and cat dialogue
|
2025-12-17 00:40:43 +01:00 |
|
|
kziolkowski
|
4f6c5ab9c1
|
fixed some layering issues in beetroot scene and added a mock convo with the domovoi
|
2025-12-17 00:15:42 +01:00 |
|
|
kziolkowski
|
11e24e249e
|
Fixed Field outline not disappearing when switching tools
|
2025-12-16 23:29:48 +01:00 |
|
|
kziolkowski
|
f3080df4b7
|
moved fence door collision shape up to reduce unwanted triggering
|
2025-12-16 23:13:38 +01:00 |
|
|
kziolkowski
|
48660b167c
|
Merge branch 'feature/bugfixes_polish_II' into feature/build_0_7
# Conflicts:
# scenes/scene_farm_outside_2d.tscn
|
2025-12-16 21:59:04 +01:00 |
|
|
jonathan
|
5f75bde317
|
💄 Made heal button show how many beats are left
|
2025-12-16 19:24:20 +01:00 |
|
|
jonathan
|
7310bfbf6e
|
✨Added flying beet to the ui when used
|
2025-12-16 19:09:03 +01:00 |
|
|
jonathan
|
fef8380a57
|
✨When beetroot is in inventory the player can heal
|
2025-12-16 19:09:03 +01:00 |
|
|
jonathan
|
f42c2c86b1
|
✨ Defeated enemygroups now drop a beet_seed
|
2025-12-16 19:09:03 +01:00 |
|
|
kziolkowski
|
f1a2e6166b
|
🐛 fixed field setup in beet scene
|
2025-12-16 18:09:51 +01:00 |
|
|
kziolkowski
|
c0111e4c17
|
🐛 fixed rake triggering field interaction + watering can interaction
|
2025-12-16 16:43:46 +01:00 |
|
|
kziolkowski
|
4f660c4af8
|
🐛 fixed rake still activating field outlines bug
|
2025-12-16 15:11:32 +01:00 |
|
|
kziolkowski
|
13fcf059e9
|
Added trash object savestate
|
2025-12-16 15:03:27 +01:00 |
|
|
kziolkowski
|
feb591f56a
|
♻️ modified changed path in start scene
|
2025-12-16 13:46:07 +01:00 |
|
|
kziolkowski
|
aac0992590
|
♻️ scene name refactoring part two: fixing scene transition paths in scenes
|
2025-12-16 13:34:32 +01:00 |
|
|
kziolkowski
|
21cf2d1a6a
|
♻️ Renamed scenes
|
2025-12-16 13:17:39 +01:00 |
|
|
kziolkowski
|
a98c842ee0
|
🐛 Fixed field interaction bug
|
2025-12-16 13:04:40 +01:00 |
|
|
kziolkowski
|
c55e527bf4
|
Merge branch 'develop' into feature/bugfixes_polish_II
|
2025-12-15 20:41:44 +01:00 |
|
|
kziolkowski
|
9e0e87ef17
|
🚧 WIP detection works now
|
2025-12-12 13:46:32 +01:00 |
|
|
kziolkowski
|
7ffbb8e68d
|
pulled ceiling lower in kitchen scene
|
2025-12-12 10:34:52 +01:00 |
|
 Jonathan
|
b810ea1d9f
|
Merge pull request 'Kampf Tooltip wird ausgeblendet' (#43) from Kampf_Tooltip into develop
Reviewed-on: #43
Reviewed-by: Jonathan <cblech@ymail.com>
|
2025-12-11 17:29:54 +01:00 |
|
|
kziolkowski
|
7e148cd9fe
|
🐛 fixed Ysorting issues in fightworld
|
2025-12-10 16:21:48 +01:00 |
|
|
kziolkowski
|
59489e4a17
|
Made common room into hub area and ajdusted Yeli dialogue
|
2025-12-10 16:02:38 +01:00 |
|
 jlink
|
fc00559483
|
Kampf Tooltip wird ausgeblendet
|
2025-12-10 15:53:55 +01:00 |
|
|
kziolkowski
|
982178d89a
|
🐛 fixed sunflower parallaxing to *perfection*
|
2025-12-10 15:34:45 +01:00 |
|
|
kziolkowski
|
c89685c936
|
🐛 fixed colliders in kitchen
|
2025-12-10 15:15:01 +01:00 |
|
|
kziolkowski
|
79108fbe15
|
🐛 fixed parallax problems
|
2025-12-10 15:12:43 +01:00 |
|
|
kziolkowski
|
bef54420e4
|
darkened fightworld room to make it look more like night
|
2025-12-07 10:54:54 +01:00 |
|
|
kziolkowski
|
9267278ce8
|
tried and failed at fixing all layering issues in beet scene
|
2025-12-07 10:43:41 +01:00 |
|
|
kziolkowski
|
9ba83dfddd
|
Made stove interactable
|
2025-12-07 10:26:20 +01:00 |
|
|
kziolkowski
|
7c5ba2d6bb
|
Added kitchen room
|
2025-12-07 10:22:02 +01:00 |
|
|
kziolkowski
|
0c5fc26d2f
|
🍱 changed forest background in first farming scene
|
2025-12-07 09:18:55 +01:00 |
|
|
kziolkowski
|
e51e0a24d2
|
🐛 fixed dialogic bugs and moved trash items out of the way
|
2025-12-06 21:46:54 +01:00 |
|
|
kziolkowski
|
61caa6eea6
|
Merge branch 'refs/heads/develop' into feature/bugfixes_And_Polish
|
2025-12-06 19:59:31 +01:00 |
|
|
jlink
|
14a73daa75
|
fighting minigame has no more Overlap with Vesna
|
2025-12-06 12:15:31 +01:00 |
|
|
kziolkowski
|
996470f5e6
|
🐛 fixed beets double spawning bug
|
2025-12-04 23:45:35 +01:00 |
|
|
kziolkowski
|
1dd4a694d0
|
Merge pull request 'feature/day_and_night' (#34) from feature/day_and_night into develop
Reviewed-on: #34
|
2025-12-04 22:34:17 +01:00 |
|
|
jlink
|
7696271727
|
fight log no longer visible and door interactable
|
2025-12-04 17:31:31 +01:00 |
|
|
kziolkowski
|
229dd04bc1
|
✨ Made bed interaction count up the days and verified that you can now play a full loop
|
2025-12-03 18:55:45 +01:00 |
|
|
kziolkowski
|
c288af296c
|
✨ made plants only grow when watered
|
2025-12-02 17:44:44 +01:00 |
|
|
kziolkowski
|
51a145a994
|
🚚 renamed player prefab to Vesna
|
2025-12-02 11:41:48 +01:00 |
|
|
kziolkowski
|
41b30a4274
|
🚧 days are counted, plants know which day it is, but harvestables are still broken
|
2025-11-28 20:25:47 +01:00 |
|
|
kziolkowski
|
67d5b67c21
|
💄 Added new game button that resets the savegame (also did some layouting)
|
2025-11-26 18:52:33 +01:00 |
|
|
kziolkowski
|
684131f495
|
✨ Make SaveableVariableNodes and a simple cheat to count up days
|
2025-11-26 18:00:45 +01:00 |
|
|
kziolkowski
|
f32033cb5f
|
Merge pull request 'Made the fight world completable' (#33) from feature/night_to_day into develop
Reviewed-on: #33
|
2025-11-26 15:11:13 +01:00 |
|