Babushka

Jonathan

Babushka

Commit Graph

Select branches

Hide Pull Requests

3d_character_controller

Animations

Anna

Enemy_selection_overlap

Kampf_Tooltip

Nao's-Sounds

Vesna_Gesichtsausdrücke_einfügen_

Vesna_resets_to_bed_after_dead

bug/attack_dead_enemy

bug/enemy_die

bug/enemy_group

bug/scene_dependency

choise_detection

deadend_wwise

develop

feature/bugfixes_And_Polish

feature/bugfixes_polish_II

feature/build_0_7

feature/damage_feedback

feature/dead_squash

feature/farm_fight_loop

feature/farming_bugfixes_and_magic_word

feature/fight_rework

feature/fight_system

feature/implement_quests

feature/import_changes

feature/integrate_new_fight

feature/languagetool-addon

feature/loading_screen

feature/night_to_day

feature/quest_system

feature/showcase_bugfixing_kathi_partII_quickfix

feature/spine2D_experimental

feature_sanel-dialogic

fighting_minigame_fix_overlap_with_Vesna

hint_box

interactions

inventory

level_transition

main

minigame_hit_feedback

minigame_variation

randomise_fight_start

remove_fightlog

test/music_setup

test/quick_juice

#1

#10

#11

#12

#13

#14

#15

#16

#17

#19

#2

#20

#21

#22

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#8

#9

5636c0da67 Add first two cat animations feature/spine2D_experimental Maximilian Konrad 2025-12-22 12:30:31 +0100
4578a2cfda Added Spine2D GDExtension bin to project kziolkowski 2025-12-22 10:48:51 +0100
5b0f00a048 SFX Added for Mavka and Slimes Defeated Nao's-Sounds Nao 2025-12-18 15:45:07 +0100
9032272599 Merge pull request 'BlobFighter TargetSelection ColliderShape2D Transform angepasst' (#42) from Enemy_selection_overlap into develop develop Jonathan 2025-12-18 13:06:03 +0100
a2ef3bfaf0 Window angepasst #42 Enemy_selection_overlap JoansLink00 2025-12-18 13:02:32 +0100
1ab1071246 HoverIndicator off JoansLink00 2025-12-17 15:29:58 +0100
b0ee8c4c58 fixed path strings in scene transitions and added disclaimer and credits back into the flow #49 feature/build_0_7 kziolkowski 2025-12-17 01:07:39 +0100
522fdfa365 Added fightworld background and cat dialogue kziolkowski 2025-12-17 00:40:43 +0100
4f6c5ab9c1 fixed some layering issues in beetroot scene and added a mock convo with the domovoi kziolkowski 2025-12-17 00:15:42 +0100
11e24e249e Fixed Field outline not disappearing when switching tools kziolkowski 2025-12-16 23:29:48 +0100
f3080df4b7 moved fence door collision shape up to reduce unwanted triggering kziolkowski 2025-12-16 23:13:38 +0100
f6e83e7fef Added event handlers in Fieldbehaviour to react to watering can state changes kziolkowski 2025-12-16 23:13:09 +0100
3bdc8cd03f Deactivated harvestable plant on spawn kziolkowski 2025-12-16 23:06:58 +0100
f862827d98 Removed Print statements kziolkowski 2025-12-16 23:06:41 +0100
a401cbe5b9 🐛 fixed field activator self-deactivating on load bug kziolkowski 2025-12-16 22:53:22 +0100
48660b167c Merge branch 'feature/bugfixes_polish_II' into feature/build_0_7 kziolkowski 2025-12-16 21:59:04 +0100
e5b2b8b8ab Merge pull request 'Connect farming and fighting by making them codependent' (#44) from feature/farm_fight_loop into develop Jonathan 2025-12-16 20:44:26 +0100
2fa8aa9fbc Merge pull request 'Vesna resets to bed after death' (#47) from Vesna_resets_to_bed_after_dead into develop Jonathan 2025-12-16 19:37:29 +0100
6deb6e29fd Merge pull request 'Made attack selection only select alive enemies' (#45) from bug/attack_dead_enemy into develop Jonathan 2025-12-16 19:30:33 +0100
edc133749f Merge pull request 'Randomized who starts the fight' (#41) from randomise_fight_start into develop Jonathan 2025-12-16 19:28:37 +0100
5f75bde317 💄 Made heal button show how many beats are left #44 feature/farm_fight_loop jonathan 2025-12-16 19:24:20 +0100
7310bfbf6e ✨Added flying beet to the ui when used jonathan 2025-12-16 18:56:18 +0100
fef8380a57 ✨When beetroot is in inventory the player can heal jonathan 2025-12-11 17:13:28 +0100
f42c2c86b1 ✨ Defeated enemygroups now drop a beet_seed jonathan 2025-12-11 15:09:28 +0100
f1a2e6166b 🐛 fixed field setup in beet scene #48 feature/bugfixes_polish_II kziolkowski 2025-12-16 18:09:51 +0100
c0111e4c17 🐛 fixed rake triggering field interaction + watering can interaction kziolkowski 2025-12-16 16:43:46 +0100
2ed9dbbc52 Vesna resets to bed after death #47 Vesna_resets_to_bed_after_dead JoansLink00 2025-12-16 15:34:52 +0100
4f660c4af8 🐛 fixed rake still activating field outlines bug kziolkowski 2025-12-16 15:11:32 +0100
13fcf059e9 Added trash object savestate kziolkowski 2025-12-16 15:03:27 +0100
7f58aeae76 removed GD.Prints kziolkowski 2025-12-16 14:33:54 +0100
3456340bb7 einfügen von Gesichtsausdrücken für Vesna #46 Vesna_Gesichtsausdrücke_einfügen_ JoansLink00 2025-12-16 14:30:23 +0100
30750d2e3c ♻️ removed planted state from Fieldstate because it didn't make any sense. kziolkowski 2025-12-16 14:27:12 +0100
950731b225 🐛 Fixed ObjectNotDisposedException on Well in beetroot scene kziolkowski 2025-12-16 13:46:28 +0100
feb591f56a ♻️ modified changed path in start scene kziolkowski 2025-12-16 13:46:07 +0100
aac0992590 ♻️ scene name refactoring part two: fixing scene transition paths in scenes kziolkowski 2025-12-16 13:34:32 +0100
21cf2d1a6a ♻️ Renamed scenes kziolkowski 2025-12-16 13:17:39 +0100
3f5cfed477 removed test scene kziolkowski 2025-12-16 13:14:46 +0100
64c15c2e63 removed print statements kziolkowski 2025-12-16 13:14:25 +0100
a98c842ee0 🐛 Fixed field interaction bug kziolkowski 2025-12-16 13:04:40 +0100
abed751d29 🚧 WIP trying to make fields have outlines again kziolkowski 2025-12-15 22:45:02 +0100
ce113e16da 🐛 planting seeds works again kziolkowski 2025-12-15 21:33:04 +0100
c55e527bf4 Merge branch 'develop' into feature/bugfixes_polish_II kziolkowski 2025-12-15 20:41:44 +0100
c509a52001 🚧 Basic interaction works now too kziolkowski 2025-12-12 13:49:16 +0100
9e0e87ef17 🚧 WIP detection works now kziolkowski 2025-12-12 13:46:32 +0100
7ffbb8e68d pulled ceiling lower in kitchen scene kziolkowski 2025-12-12 10:34:52 +0100
6375383373 🐛Made attack selection only select alive enemies #45 bug/attack_dead_enemy jonathan 2025-12-11 18:49:51 +0100
b810ea1d9f Merge pull request 'Kampf Tooltip wird ausgeblendet' (#43) from Kampf_Tooltip into develop Jonathan 2025-12-11 17:29:54 +0100
b232cb31c3 🚧 interaction kinda sorta works now, still needs tweaking kziolkowski 2025-12-10 16:57:39 +0100
a6260efc07 Merge branch 'develop' into feature/bugfixes_polish_II kziolkowski 2025-12-10 16:24:18 +0100
3d19509826 Merge pull request 'feature/art_update' (#40) from feature/art_update into develop kziolkowski 2025-12-10 16:23:41 +0100
113dd0820f Merge branch 'develop' into feature/art_update #40 kziolkowski 2025-12-10 16:23:04 +0100
7e148cd9fe 🐛 fixed Ysorting issues in fightworld kziolkowski 2025-12-10 16:21:48 +0100
59489e4a17 Made common room into hub area and ajdusted Yeli dialogue kziolkowski 2025-12-10 16:02:38 +0100
fc00559483 Kampf Tooltip wird ausgeblendet #43 Kampf_Tooltip JoansLink00 2025-12-10 15:53:55 +0100
982178d89a 🐛 fixed sunflower parallaxing to *perfection* kziolkowski 2025-12-10 15:34:45 +0100
09f55d3aa7 BlobFighter TargetSelection ColliderShape2D Transform angepasst JoansLink00 2025-12-10 15:29:56 +0100
c89685c936 🐛 fixed colliders in kitchen kziolkowski 2025-12-10 15:15:01 +0100
79108fbe15 🐛 fixed parallax problems kziolkowski 2025-12-10 15:12:43 +0100
9499c27444 🚧 WIP: trying to rework the detection system (it fails) kziolkowski 2025-12-09 17:51:00 +0100
0434667c22 Merge pull request 'feature/bugfixes_And_Polish' (#39) from feature/bugfixes_And_Polish into develop Jonathan 2025-12-09 15:20:36 +0100
a736adaafb Randomized who starts the fight #41 randomise_fight_start jonathan 2025-12-09 15:07:50 +0100
bef54420e4 darkened fightworld room to make it look more like night kziolkowski 2025-12-07 10:54:54 +0100
9267278ce8 tried and failed at fixing all layering issues in beet scene kziolkowski 2025-12-07 10:43:41 +0100
9ba83dfddd Made stove interactable kziolkowski 2025-12-07 10:26:20 +0100
7c5ba2d6bb Added kitchen room kziolkowski 2025-12-07 10:22:02 +0100
0c5fc26d2f 🍱 changed forest background in first farming scene kziolkowski 2025-12-07 09:18:55 +0100
e51e0a24d2 🐛 fixed dialogic bugs and moved trash items out of the way #39 feature/bugfixes_And_Polish kziolkowski 2025-12-06 21:46:54 +0100
7bb523f9e7 🐛 harvested plants don't come back on scene reload kziolkowski 2025-12-06 20:47:56 +0100
a3651d6268 deleted unused code kziolkowski 2025-12-06 20:40:47 +0100
0892a13e66 🐛 fixed beet harvesting kziolkowski 2025-12-06 20:36:22 +0100
61caa6eea6 Merge branch 'refs/heads/develop' into feature/bugfixes_And_Polish kziolkowski 2025-12-06 19:59:31 +0100
2ec693eed2 Merge pull request 'Added visual feedback when hitting a region in the minigame' (#37) from minigame_hit_feedback into develop kziolkowski 2025-12-06 19:54:11 +0100
b7d1f9d8d5 Merge branch 'develop' into minigame_hit_feedback #37 minigame_hit_feedback kziolkowski 2025-12-06 19:54:05 +0100
12bf632932 Merge pull request 'Added randomnes into attack minigame' (#36) from minigame_variation into develop kziolkowski 2025-12-06 19:53:49 +0100
0d985e5bf6 Merge branch 'develop' into minigame_variation #36 minigame_variation kziolkowski 2025-12-06 19:53:44 +0100
e86b3e81dd Merge pull request 'fighting minigame has no more Overlap with Vesna' (#38) from fighting_minigame_fix_overlap_with_Vesna into develop kziolkowski 2025-12-06 19:46:23 +0100
14a73daa75 fighting minigame has no more Overlap with Vesna #38 fighting_minigame_fix_overlap_with_Vesna JoansLink00 2025-12-06 12:15:31 +0100
996470f5e6 🐛 fixed beets double spawning bug kziolkowski 2025-12-04 23:45:35 +0100
1dd4a694d0 Merge pull request 'feature/day_and_night' (#34) from feature/day_and_night into develop kziolkowski 2025-12-04 22:34:17 +0100
9b8933e698 ♻️ removed no longer used method #34 kziolkowski 2025-12-04 22:33:45 +0100
9f4cda0e6d ♻️ Replaced _ready mit _entertree (while deferring) kziolkowski 2025-12-04 22:22:40 +0100
1c865730a3 🚚 renamed directory kziolkowski 2025-12-04 22:05:33 +0100
aa4f1c55b5 ✨Added visual feedback when hitting a region in the minigame jonathan 2025-12-04 21:18:47 +0100
aad6c44567 Added randomnes into attack minigame jonathan 2025-12-04 18:00:20 +0100
8e9359d6f8 Merge pull request 'fight log no longer visible and door interactable' (#35) from remove_fightlog into develop jlink 2025-12-04 17:39:10 +0100
7696271727 fight log no longer visible and door interactable #35 remove_fightlog JoansLink00 2025-12-04 17:31:31 +0100
229dd04bc1 ✨ Made bed interaction count up the days and verified that you can now play a full loop kziolkowski 2025-12-03 18:55:45 +0100
8407ce4c1f ✨ Added Tab button mapping to inventory and fixed label descriptor kziolkowski 2025-12-03 18:18:54 +0100
b9a52dadcc ✨ fields can now seperate "today" from any other day kziolkowski 2025-12-03 17:56:45 +0100
0ecae5a4d9 ✨ watering can fillstate is saving and loading kziolkowski 2025-12-03 17:04:38 +0100
c288af296c ✨ made plants only grow when watered kziolkowski 2025-12-02 17:44:44 +0100
e65330786e 🐛 fixed dayplanted confusion on plants kziolkowski 2025-12-02 15:45:44 +0100
c7a4aea70b ✨ Starting a new game resets the inventory now kziolkowski 2025-12-02 12:08:19 +0100
b6caf4dbed 🐛 Fixed ObjectDisposedException Errors on plant/field and InventorySlot kziolkowski 2025-12-02 11:42:48 +0100
51a145a994 🚚 renamed player prefab to Vesna kziolkowski 2025-12-02 11:41:20 +0100
41b30a4274 🚧 days are counted, plants know which day it is, but harvestables are still broken kziolkowski 2025-11-28 20:25:47 +0100
a1fb71119f 🚧 WIP binding the plant growth to the day count in the savefile kziolkowski 2025-11-26 20:12:27 +0100
67d5b67c21 💄 Added new game button that resets the savegame (also did some layouting) kziolkowski 2025-11-26 18:52:33 +0100
684131f495 ✨ Make SaveableVariableNodes and a simple cheat to count up days kziolkowski 2025-11-26 18:00:45 +0100
f32033cb5f Merge pull request 'Made the fight world completable' (#33) from feature/night_to_day into develop kziolkowski 2025-11-26 15:11:13 +0100