 Katharina Ziolkowski
|
1120f17202
|
shader adjustments to account for modulate value
|
2026-02-01 14:00:21 +01:00 |
|
 kziolkowski
|
2c8a024528
|
Merge pull request 'feature/build_0_7' (#49) from feature/build_0_7 into develop
Reviewed-on: #49
Reviewed-by: Jonathan <cblech@ymail.com>
|
2026-01-27 13:04:21 +01:00 |
|
|
kziolkowski
|
76eb408a40
|
Merge branch 'develop' into feature/build_0_7
|
2026-01-27 13:01:34 +01:00 |
|
|
Katharina Ziolkowski
|
ff143f07e7
|
deleted unused autosave file
|
2026-01-27 13:00:38 +01:00 |
|
 Jonathan
|
b50ca5b919
|
Merge pull request 'einfügen von Gesichtsausdrücken für Vesna' (#46) from Vesna_Gesichtsausdrücke_einfügen_ into develop
Reviewed-on: #46
Reviewed-by: Jonathan <cblech@ymail.com>
|
2026-01-13 23:43:46 +01:00 |
|
|
Jonathan
|
9032272599
|
Merge pull request 'BlobFighter TargetSelection ColliderShape2D Transform angepasst' (#42) from Enemy_selection_overlap into develop
Reviewed-on: #42
Reviewed-by: Jonathan <cblech@ymail.com>
|
2025-12-18 13:06:03 +01:00 |
|
 jlink
|
a2ef3bfaf0
|
Window angepasst
|
2025-12-18 13:02:32 +01:00 |
|
|
jlink
|
1ab1071246
|
HoverIndicator off
|
2025-12-17 15:29:58 +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
|
f6e83e7fef
|
Added event handlers in Fieldbehaviour to react to watering can state changes
|
2025-12-16 23:13:09 +01:00 |
|
|
kziolkowski
|
3bdc8cd03f
|
Deactivated harvestable plant on spawn
|
2025-12-16 23:06:58 +01:00 |
|
|
kziolkowski
|
f862827d98
|
Removed Print statements
|
2025-12-16 23:06:41 +01:00 |
|
|
kziolkowski
|
a401cbe5b9
|
🐛 fixed field activator self-deactivating on load bug
|
2025-12-16 22:53:22 +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
|
e5b2b8b8ab
|
Merge pull request 'Connect farming and fighting by making them codependent' (#44) from feature/farm_fight_loop into develop
Reviewed-on: #44
|
2025-12-16 20:44:26 +01:00 |
|
|
Jonathan
|
2fa8aa9fbc
|
Merge pull request 'Vesna resets to bed after death' (#47) from Vesna_resets_to_bed_after_dead into develop
Reviewed-on: #47
Reviewed-by: Jonathan <cblech@ymail.com>
|
2025-12-16 19:37:29 +01:00 |
|
|
Jonathan
|
6deb6e29fd
|
Merge pull request 'Made attack selection only select alive enemies' (#45) from bug/attack_dead_enemy into develop
Reviewed-on: #45
Reviewed-by: kziolkowski <katharina.ziolkowski@gmail.com>
|
2025-12-16 19:30:33 +01:00 |
|
|
Jonathan
|
edc133749f
|
Merge pull request 'Randomized who starts the fight' (#41) from randomise_fight_start into develop
Reviewed-on: #41
Reviewed-by: kziolkowski <katharina.ziolkowski@gmail.com>
|
2025-12-16 19:28:37 +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 |
|
|
jlink
|
2ed9dbbc52
|
Vesna resets to bed after death
|
2025-12-16 15:34:52 +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
|
7f58aeae76
|
removed GD.Prints
|
2025-12-16 14:33:54 +01:00 |
|
|
jlink
|
3456340bb7
|
einfügen von Gesichtsausdrücken für Vesna
|
2025-12-16 14:30:23 +01:00 |
|
|
kziolkowski
|
30750d2e3c
|
♻️ removed planted state from Fieldstate because it didn't make any sense.
|
2025-12-16 14:27:12 +01:00 |
|
|
kziolkowski
|
950731b225
|
🐛 Fixed ObjectNotDisposedException on Well in beetroot scene
|
2025-12-16 13:46:28 +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
|
3f5cfed477
|
removed test scene
|
2025-12-16 13:14:46 +01:00 |
|
|
kziolkowski
|
64c15c2e63
|
removed print statements
|
2025-12-16 13:14:25 +01:00 |
|
|
kziolkowski
|
a98c842ee0
|
🐛 Fixed field interaction bug
|
2025-12-16 13:04:40 +01:00 |
|
|
kziolkowski
|
abed751d29
|
🚧 WIP trying to make fields have outlines again
|
2025-12-15 22:45:02 +01:00 |
|
|
kziolkowski
|
ce113e16da
|
🐛 planting seeds works again
|
2025-12-15 21:33:04 +01:00 |
|
|
kziolkowski
|
c55e527bf4
|
Merge branch 'develop' into feature/bugfixes_polish_II
|
2025-12-15 20:41:44 +01:00 |
|
|
kziolkowski
|
c509a52001
|
🚧 Basic interaction works now too
|
2025-12-12 13:49:16 +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
|
6375383373
|
🐛Made attack selection only select alive enemies
|
2025-12-11 18:49:51 +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
|
b232cb31c3
|
🚧 interaction kinda sorta works now, still needs tweaking
|
2025-12-10 16:57:39 +01:00 |
|