Commit Graph

Select branches

Hide Pull Requests

3d_character_controller

Animations

Anna

Enemy_selection_overlap

Kampf_Tooltip

Minigame_extra_click

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/damage_feedback

feature/dead_squash

feature/entity_rework

feature/farm_fight_loop

feature/fight_rework

feature/fight_system

feature/implement_quests

feature/integrate_new_fight

feature/languagetool-addon

feature/night_to_day

feature/quest_system

feature/screenshots-storyboard

feature/shaders_with_modulate

feature/spine2D_experimental

feature/trash_object_entity_removable

feature/vesna_entity

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

tmp/mock_qad_scripts

#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

#49

#50

#52

#53

#54

#8

#9

Mono Color

• cd235248c6 ✨Added minigame label for each region jonathan 2025-10-03 19:37:54 +02:00
• 8bb1c22549 Added minigame to attack action jonathan 2025-10-02 15:49:24 +02:00
• 8624e2aea8 Added minigame jonathan 2025-10-02 01:32:52 +02:00
• fef1bcc3b6 cap health at minimum 0 jonathan 2025-10-01 13:16:41 +02:00
• f4d8ed87e2 Added blob attack action jonathan 2025-10-01 01:42:29 +02:00
• 1f227f70a7 Added basic health bar jonathan 2025-09-30 19:00:52 +02:00
• 9bf25640f6 Added basic action animation jonathan 2025-09-30 17:36:28 +02:00
• 0e315396c9 Made fight fightable jonathan 2025-09-30 16:23:05 +02:00
• f27dd199b8 Fight happening base setup jonathan 2025-09-21 14:54:55 +02:00
• fd0e631b1f 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 +02:00
• 6ba26c360d 🚧 reworking Fieldservice kziolkowski 2025-10-31 14:08:55 +01:00
• 63fd81e54d 🔥 removed no longer needed scene call group kziolkowski 2025-10-31 12:38:48 +01:00
• b54f784d51 🎨 Replaced pickup animation group call with event kziolkowski 2025-10-31 12:36:08 +01:00
• 6194988bf0 🎨 removed plant growing call group and replaced it with an event call. Made FarmingAnimation play on event. kziolkowski 2025-10-31 12:07:05 +01:00
• 759933c1cd Merge pull request 'feature/detection_cross' (#21) from feature/detection_cross into develop kziolkowski 2025-10-31 10:47:20 +01:00
• af8807610d :bug increased interaction area size for fence gates kziolkowski 2025-10-29 16:25:31 +01:00
• 02b6584e44 🐛 fixed ObjectDisposedException from the Inventory when switching scenes. kziolkowski 2025-10-29 16:03:36 +01:00
• e202534c6b 🐛 Vesnas Namensschild sieht nicht richtig aus FIXED kziolkowski 2025-10-29 15:00:30 +01:00
• 1f13f3ea51 Merge branch 'develop' into feature/detection_cross kziolkowski 2025-10-29 14:01:55 +01:00
• 8b7afbcab6 Merge remote-tracking branch 'origin/feature/detection_cross' into feature/detection_cross kziolkowski 2025-10-29 13:32:57 +01:00
• afce4ad0b9 Merge pull request 'feature/events' (#19) from feature/events into develop Jonathan 2025-10-28 21:12:45 +01:00
• 32ac007256 🎨 Exchanged Quest post it with ui sprite kziolkowski 2025-10-24 13:43:13 +02:00
• d45deeb7ed 🔧 adjusted seed pickup positions and indoor collider sizes kziolkowski 2025-10-24 15:57:14 +02:00
• 9e21b07271 🍱 Adjusted colliders in farm_outside scene and reactivated ground collider on Vesna kziolkowski 2025-10-24 15:45:10 +02:00
• f94c2d0a50 :memo::fire:🔨 - removed a lot of unnecessary code - Made a minimal working version - Added documentation kziolkowski 2025-10-24 15:13:35 +02:00
• 84b8938d1f 🚧 WIP first setup completed (still buggy!) kziolkowski 2025-10-22 19:30:33 +02:00
• 8d421b58ec Implemented dialogue box design as described in mockups kziolkowski 2025-10-22 14:23:48 +02:00
• ebe99c5f22 💄 Added new fonts and increased textbox size. Also added border line. kziolkowski 2025-10-21 13:41:43 +02:00
• b32b483d09 upgraded project to 4.5 kziolkowski 2025-10-21 12:59:29 +02:00
• c6e9bc9336 scene updates after undoing changes to interactionArea kziolkowski 2025-10-03 17:02:07 +02:00
• 5b0fed7816 sound autoimports kziolkowski 2025-10-03 16:52:17 +02:00
• 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 +02:00
• 3fe79f2fd8 ✨ Added VariableGetter functionality and some Variable setting components. Also added them to test scene. kziolkowski 2025-10-28 13:09:36 +01:00
• 8c1157c26e 🔥 removed indexed RaiseEvent-Call from EventRaiser kziolkowski 2025-10-28 12:04:41 +01:00
• c96e6da78e ✨ Separated events from variables and adjusted test scene kziolkowski 2025-10-28 11:57:36 +01:00
• 0fc1760b70 Merge pull request 'feature/animations_update' (#17) from feature/animations_update into develop kziolkowski 2025-10-28 10:59:32 +01:00
• 90b8dda16a Merge branch 'feature/dialogic_style_rework' into feature/detection_cross kziolkowski 2025-10-28 10:56:22 +01:00
• ecff43d5c3 Merge branch 'develop' into feature/detection_cross kziolkowski 2025-10-28 10:46:02 +01:00
• 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 +02:00
• 427db88474 🧪 Tested music setup with new music concept test/music_setup jonathan 2025-10-24 18:10:00 +02:00
• e1b1a2f447 🔧 adjusted seed pickup positions and indoor collider sizes kziolkowski 2025-10-24 15:57:14 +02:00
• 2d4e853ec8 🍱 Adjusted colliders in farm_outside scene and reactivated ground collider on Vesna kziolkowski 2025-10-24 15:45:10 +02:00
• 8f097de476 :memo::fire:🔨 - removed a lot of unnecessary code - Made a minimal working version - Added documentation kziolkowski 2025-10-24 15:13:35 +02:00
• 109573fb1b 🎨 Exchanged Quest post it with ui sprite kziolkowski 2025-10-24 13:43:13 +02:00
• 0e55394699 🚧 WIP first setup completed (still buggy!) kziolkowski 2025-10-22 19:30:33 +02:00
• b1335d4b00 Merge branch 'feature/dialogic_style_rework' into feature/detection_cross kziolkowski 2025-10-22 14:46:55 +02:00
• 078e26e868 Implemented dialogue box design as described in mockups kziolkowski 2025-10-22 14:23:48 +02:00
• ffebe10593 💄 Added new fonts and increased textbox size. Also added border line. kziolkowski 2025-10-21 13:41:43 +02:00
• 4c8406ba97 upgraded project to 4.5 kziolkowski 2025-10-21 12:59:29 +02:00
• 080ebaae47 removed redundant import statement kziolkowski 2025-10-21 12:50:48 +02:00
• 5cf250b295 ✨ Added randomizer class for certain types of EventResources kziolkowski 2025-10-21 12:39:17 +02:00
• ef56f79d5c ✨ Added event payload and Valuechange-handling kziolkowski 2025-10-21 12:39:01 +02:00
• 5bcbee8865 created test scene and removed event test elements from start scene kziolkowski 2025-10-21 12:38:15 +02:00
• a74abe684b Godot upgrade to 4.5 kziolkowski 2025-10-21 12:33:38 +02:00
• a593be8273 📝 added documentation and improved event scope kziolkowski 2025-10-18 17:15:35 +02:00
• 1e004b62b8 Implemented first version of EventResources kziolkowski 2025-10-13 09:57:49 +02:00
• 45d4b26b6a ♻️ Implemented FightersFormation to keep track of the fight entered state of the fighters jonathan 2025-10-07 18:08:53 +02:00
• 719b1fa800 ♻️Code cleanup jonathan 2025-10-07 15:29:39 +02:00
• bd6432f568 🐛Exiting fight happening when one side wins jonathan 2025-10-05 19:50:05 +02:00
• 224863f891 ✨Added theme-based region colors jonathan 2025-10-03 20:02:25 +02:00
• 7d35c991f3 ✨Added minigame label for each region jonathan 2025-10-03 19:37:54 +02:00
• 5fc7b3d563 scene updates after undoing changes to interactionArea kziolkowski 2025-10-03 17:02:07 +02:00
• d4892e1aa4 sound autoimports kziolkowski 2025-10-03 16:52:17 +02:00
• e0ea5ef5be Merge branch 'feature/sounds_update' into feature/bugfixing_kathi_partIII kziolkowski 2025-10-03 16:45:30 +02:00
• 02ff401273 Merge branch 'feature/animations_update' into feature/bugfixing_kathi_partIII kziolkowski 2025-10-03 16:45:14 +02:00
• c3e78b5db2 Merge remote-tracking branch 'origin/Nao's-Sounds' into feature/sounds_update kziolkowski 2025-10-03 16:39:30 +02:00
• 09b2baab0a Merge remote-tracking branch 'origin/Animations' into feature/animations_update kziolkowski 2025-10-03 16:20:23 +02:00
• ff8e4a85d2 Added minigame to attack action jonathan 2025-10-02 15:49:24 +02:00
• 96df233496 Added minigame jonathan 2025-10-02 01:32:52 +02:00
• 3f23f4471b cap health at minimum 0 jonathan 2025-10-01 13:16:41 +02:00
• f2bf44bf9e Added blob attack action jonathan 2025-10-01 01:42:29 +02:00
• f0db6372e5 Added basic health bar jonathan 2025-09-30 19:00:52 +02:00
• 52f1560c48 Added basic action animation jonathan 2025-09-30 17:36:28 +02:00
• 8055381478 Made fight fightable jonathan 2025-09-30 16:23:05 +02:00
• d6a2b586e4 🐛 fixed ducks counting bug kziolkowski 2025-09-27 17:38:23 +02:00
• 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 +02:00
• e73f13d7d4 🎨 💄 Created art template for farm plants and reworked existing plant prefabs and inventory resources kziolkowski 2025-09-27 16:54:17 +02:00
• 0713e334b3 Fixed InventoryInstance behaviour kziolkowski 2025-09-26 00:31:11 +02:00
• daabcdc5ee Fight happening base setup jonathan 2025-09-21 14:54:55 +02:00
• c56f654751 Set up second garden with beetroot, built transition from yard and back kziolkowski 2025-09-17 17:58:28 +02:00
• 1f88f9b4b5 Added beetroot as growable plant kziolkowski 2025-09-17 16:53:57 +02:00
• 06fd80f762 grass layering fix kziolkowski 2025-09-17 15:10:29 +02:00
• 2cb605261e Fixed Tomato farming (again) kziolkowski 2025-09-17 15:07:17 +02:00
• 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 +02:00
• 975dd45c94 fixed item repository bug kziolkowski 2025-09-10 15:06:49 +02:00
• d1a8ff0cbf WIP reworking the item repository kziolkowski 2025-09-09 23:57:55 +02:00
• 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 +02:00
• 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 +02:00
• da7cd2f6f2 Small update Animations Felix Paul 2025-09-01 19:52:11 +02:00
• 9f50e1d293 WIP trying to implement pickup sounds kziolkowski 2025-08-27 18:21:28 +02:00
• 652cac4232 Added typing sounds to dialogic characters kziolkowski 2025-08-27 18:00:26 +02:00
• e44e06bace Added Footsteps SFX kziolkowski 2025-08-27 17:12:12 +02:00
• 89313fd484 Merge remote-tracking branch 'origin/Nao's-Sounds' into feature/showcase_bugfixing_kathi_partII kziolkowski 2025-08-27 15:19:47 +02:00
• 6f340b54a4 SFX Footstep Gravel Added Nao 2025-08-25 19:15:38 +02:00
• 8f3be823a4 Added Single Footstep SFX, added folders and moved files for better organization Nao 2025-08-21 17:46:53 +02:00
• eeb56fd7ad Added possibility to deactivate an interactionarea if there is no more timelines to play kziolkowski 2025-08-20 00:48:12 +02:00
• 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 +02:00
• 378bf45c49 Implemented PR feedback + made sure initial farming quests run smoothly kziolkowski 2025-08-19 23:02:14 +02:00
• f6e0c4e615 minor scene fixes kziolkowski 2025-08-18 00:10:20 +02:00
• 6ae877f2ab Implemented first version of an interactable area that reacts to inventory selection kziolkowski 2025-08-17 23:49:04 +02:00