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

84b8938d1f 🚧 WIP first setup completed (still buggy!) kziolkowski 2025-10-22 19:30:33 +0200
8d421b58ec Implemented dialogue box design as described in mockups kziolkowski 2025-10-22 14:23:48 +0200
ebe99c5f22 💄 Added new fonts and increased textbox size. Also added border line. kziolkowski 2025-10-21 13:41:43 +0200
b32b483d09 upgraded project to 4.5 kziolkowski 2025-10-21 12:59:29 +0200
c6e9bc9336 scene updates after undoing changes to interactionArea kziolkowski 2025-10-03 17:02:07 +0200
5b0fed7816 sound autoimports kziolkowski 2025-10-03 16:52:17 +0200
3bdd5aa873 SFX for Wolf added + redone reverb of footsteps (but not sure it worked?! - possible new upload/replacement possible) Nao 2025-09-08 16:51:21 +0200
f76645e45c ✨ Added animated loading screen feature/loading_screen kziolkowski 2025-10-28 15:37:24 +0100
3fe79f2fd8 ✨ Added VariableGetter functionality and some Variable setting components. Also added them to test scene. #19 kziolkowski 2025-10-28 13:09:36 +0100
8c1157c26e 🔥 removed indexed RaiseEvent-Call from EventRaiser kziolkowski 2025-10-28 12:04:41 +0100
c96e6da78e ✨ Separated events from variables and adjusted test scene kziolkowski 2025-10-28 11:57:36 +0100
0fc1760b70 Merge pull request 'feature/animations_update' (#17) from feature/animations_update into develop kziolkowski 2025-10-28 10:59:32 +0100
90b8dda16a Merge branch 'feature/dialogic_style_rework' into feature/detection_cross kziolkowski 2025-10-28 10:56:22 +0100
ecff43d5c3 Merge branch 'develop' into feature/detection_cross kziolkowski 2025-10-28 10:46:02 +0100
40b8c022fe Merge pull request 'feature/showcase_bugfixing_kathi_partII' (#16) from feature/showcase_bugfixing_kathi_partII into develop Jonathan 2025-10-24 18:31:55 +0200
427db88474 🧪 Tested music setup with new music concept test/music_setup jonathan 2025-10-24 18:10:00 +0200
e1b1a2f447 🔧 adjusted seed pickup positions and indoor collider sizes kziolkowski 2025-10-24 15:57:14 +0200
2d4e853ec8 🍱 Adjusted colliders in farm_outside scene and reactivated ground collider on Vesna kziolkowski 2025-10-24 15:45:10 +0200
8f097de476 📝🔥🔨 - removed a lot of unnecessary code - Made a minimal working version - Added documentation kziolkowski 2025-10-24 15:13:35 +0200
109573fb1b 🎨 Exchanged Quest post it with ui sprite #20 kziolkowski 2025-10-24 13:43:13 +0200
0e55394699 🚧 WIP first setup completed (still buggy!) kziolkowski 2025-10-22 19:30:33 +0200
b1335d4b00 Merge branch 'feature/dialogic_style_rework' into feature/detection_cross kziolkowski 2025-10-22 14:46:55 +0200
078e26e868 Implemented dialogue box design as described in mockups kziolkowski 2025-10-22 14:23:48 +0200
ffebe10593 💄 Added new fonts and increased textbox size. Also added border line. kziolkowski 2025-10-21 13:41:43 +0200
4c8406ba97 upgraded project to 4.5 kziolkowski 2025-10-21 12:59:29 +0200
080ebaae47 removed redundant import statement kziolkowski 2025-10-21 12:50:48 +0200
5cf250b295 ✨ Added randomizer class for certain types of EventResources kziolkowski 2025-10-21 12:39:17 +0200
ef56f79d5c ✨ Added event payload and Valuechange-handling kziolkowski 2025-10-21 12:39:01 +0200
5bcbee8865 created test scene and removed event test elements from start scene kziolkowski 2025-10-21 12:38:15 +0200
a74abe684b Godot upgrade to 4.5 kziolkowski 2025-10-21 12:33:38 +0200
a593be8273 📝 added documentation and improved event scope kziolkowski 2025-10-18 17:15:35 +0200
1e004b62b8 Implemented first version of EventResources kziolkowski 2025-10-13 09:57:49 +0200
45d4b26b6a ♻️ Implemented FightersFormation to keep track of the fight entered state of the fighters jonathan 2025-10-07 18:08:53 +0200
719b1fa800 ♻️Code cleanup jonathan 2025-10-07 15:29:39 +0200
bd6432f568 🐛Exiting fight happening when one side wins jonathan 2025-10-05 19:50:05 +0200
224863f891 ✨Added theme-based region colors jonathan 2025-10-03 20:02:25 +0200
7d35c991f3 ✨Added minigame label for each region jonathan 2025-10-03 19:37:54 +0200
5fc7b3d563 scene updates after undoing changes to interactionArea kziolkowski 2025-10-03 17:02:07 +0200
d4892e1aa4 sound autoimports kziolkowski 2025-10-03 16:52:17 +0200
e0ea5ef5be Merge branch 'feature/sounds_update' into feature/bugfixing_kathi_partIII kziolkowski 2025-10-03 16:45:30 +0200
02ff401273 Merge branch 'feature/animations_update' into feature/bugfixing_kathi_partIII kziolkowski 2025-10-03 16:45:14 +0200
c3e78b5db2 Merge remote-tracking branch 'origin/Nao's-Sounds' into feature/sounds_update kziolkowski 2025-10-03 16:39:30 +0200
09b2baab0a Merge remote-tracking branch 'origin/Animations' into feature/animations_update #17 kziolkowski 2025-10-03 16:20:23 +0200
ff8e4a85d2 Added minigame to attack action jonathan 2025-10-02 15:49:24 +0200
96df233496 Added minigame jonathan 2025-10-02 01:32:52 +0200
3f23f4471b cap health at minimum 0 jonathan 2025-10-01 13:16:41 +0200
f2bf44bf9e Added blob attack action jonathan 2025-10-01 01:42:29 +0200
f0db6372e5 Added basic health bar jonathan 2025-09-30 19:00:52 +0200
52f1560c48 Added basic action animation jonathan 2025-09-30 17:36:28 +0200
8055381478 Made fight fightable jonathan 2025-09-30 16:23:05 +0200
d6a2b586e4 🐛 fixed ducks counting bug #16 kziolkowski 2025-09-27 17:38:23 +0200
936983e14f 💄 updated dialogic style to make it clearer who is talking and have vesna always on the left side kziolkowski 2025-09-27 17:24:01 +0200
e73f13d7d4 🎨 💄 Created art template for farm plants and reworked existing plant prefabs and inventory resources kziolkowski 2025-09-27 16:54:17 +0200
0713e334b3 Fixed InventoryInstance behaviour kziolkowski 2025-09-26 00:31:11 +0200
daabcdc5ee Fight happening base setup jonathan 2025-09-21 14:54:55 +0200
c56f654751 Set up second garden with beetroot, built transition from yard and back kziolkowski 2025-09-17 17:58:28 +0200
1f88f9b4b5 Added beetroot as growable plant kziolkowski 2025-09-17 16:53:57 +0200
06fd80f762 grass layering fix kziolkowski 2025-09-17 15:10:29 +0200
2cb605261e Fixed Tomato farming (again) kziolkowski 2025-09-17 15:07:17 +0200
2929c5dd25 Bootstrap fight system - Fight World data structure - Generating basic fight world - Opening correct fight room - Block paths in fight rooms - Transition between rooms jonathan 2025-09-12 13:20:27 +0200
975dd45c94 fixed item repository bug kziolkowski 2025-09-10 15:06:49 +0200
d1a8ff0cbf WIP reworking the item repository kziolkowski 2025-09-09 23:57:55 +0200
cba6c09ca0 SFX for Wolf added + redone reverb of footsteps (but not sure it worked?! - possible new upload/replacement possible) Nao 2025-09-08 16:51:21 +0200
83091cc4b4 style testing - added sun overlay effect - added scrolling fog - added post processing (ACES tonemapping) - added particles - added more plants - increased wind strength test/quick_juice jonathan 2025-09-05 01:14:47 +0200
029a9d481b And other stuff (still don't merge) feature/showcase_bugfixing_kathi_partII_quickfix jonathan 2025-09-04 23:14:01 +0200
da7cd2f6f2 Small update Animations Felix Paul 2025-09-01 19:52:11 +0200
9f50e1d293 WIP trying to implement pickup sounds kziolkowski 2025-08-27 18:21:28 +0200
652cac4232 Added typing sounds to dialogic characters kziolkowski 2025-08-27 18:00:26 +0200
e44e06bace Added Footsteps SFX kziolkowski 2025-08-27 17:12:12 +0200
89313fd484 Merge remote-tracking branch 'origin/Nao's-Sounds' into feature/showcase_bugfixing_kathi_partII kziolkowski 2025-08-27 15:19:47 +0200
6f340b54a4 SFX Footstep Gravel Added Nao 2025-08-25 19:15:38 +0200
8f3be823a4 Added Single Footstep SFX, added folders and moved files for better organization Nao 2025-08-21 17:46:53 +0200
eeb56fd7ad Added possibility to deactivate an interactionarea if there is no more timelines to play kziolkowski 2025-08-20 00:48:12 +0200
871e1856f1 Tools get deactivated from animation when switching to an empty slot in the inventory. Also fixed layering (AGAIN) kziolkowski 2025-08-20 00:26:58 +0200
378bf45c49 Implemented PR feedback + made sure initial farming quests run smoothly kziolkowski 2025-08-19 23:02:14 +0200
57d19a8ad2 Quick and dirty fix, do not merge jonathan 2025-08-19 14:10:34 +0200
f6e0c4e615 minor scene fixes kziolkowski 2025-08-18 00:10:20 +0200
6ae877f2ab Implemented first version of an interactable area that reacts to inventory selection kziolkowski 2025-08-17 23:49:04 +0200
3913143892 Added Hotkey-Info to inventory prefab kziolkowski 2025-08-17 23:21:45 +0200
4734ae953c Added option to play pickup animation for non-inventory items kziolkowski 2025-08-17 23:13:39 +0200
5992c390ee Reinstated plantgrowing animation kziolkowski 2025-08-17 23:07:22 +0200
283caf282b Added interaction on mouse click kziolkowski 2025-08-17 22:50:28 +0200
7c03964d33 changed watering can display to slider kziolkowski 2025-08-17 22:41:45 +0200
36c948f116 re-added watering animation and vfx kziolkowski 2025-08-17 22:18:39 +0200
d0ba4076b3 planting, growing and watering a little less dependent than before kziolkowski 2025-08-17 22:11:18 +0200
7fd26ffed3 Fixed tomato farming again kziolkowski 2025-08-17 21:57:57 +0200
ce2d7eb773 WIP moving seed to plant matching into separate system, making fields independent of specific plants. kziolkowski 2025-08-15 18:42:17 +0200
41365fb5d4 Fixed tool animation kziolkowski 2025-08-15 17:19:22 +0200
96c7d35aa7 Added word wrapping to quest post it. kziolkowski 2025-08-15 17:18:52 +0200
c2f5359d0c changes after develop merge kziolkowski 2025-08-15 17:03:18 +0200
9bebe1a44d Merge pull request 'Implemented first demo quest line' (#15) from feature/implement_quests into develop Jonathan 2025-08-14 23:28:09 +0200
06a270e916 Renamed function to not sound like a unity signal #15 feature/implement_quests jonathan 2025-08-14 23:27:15 +0200
b621df5435 removed invisible character jonathan 2025-08-14 23:16:52 +0200
03dbc08293 quest status name refactoring jonathan 2025-08-14 21:54:18 +0200
49fa5d08de Added fun button feature/languagetool-addon jonathan 2025-08-14 20:21:13 +0200
1ee9dea9f6 Fixes in project jonathan 2025-08-14 06:30:38 +0200
d5fa2f88be Created LanguageTool Plugin jonathan 2025-08-14 06:30:17 +0200
8676bbb2f6 Fix spelling jonathan 2025-08-13 17:13:33 +0200
6e998810b6 Completed first demo quest line jonathan 2025-08-13 03:23:45 +0200
c96be7467e Added Quest field jonathan 2025-08-11 19:15:12 +0200