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

• 3913143892 Added Hotkey-Info to inventory prefab kziolkowski 2025-08-17 23:21:45 +02:00
• 4734ae953c Added option to play pickup animation for non-inventory items kziolkowski 2025-08-17 23:13:39 +02:00
• 5992c390ee Reinstated plantgrowing animation kziolkowski 2025-08-17 23:07:22 +02:00
• 283caf282b Added interaction on mouse click kziolkowski 2025-08-17 22:50:28 +02:00
• 7c03964d33 changed watering can display to slider kziolkowski 2025-08-17 22:41:45 +02:00
• 36c948f116 re-added watering animation and vfx kziolkowski 2025-08-17 22:18:39 +02:00
• d0ba4076b3 planting, growing and watering a little less dependent than before kziolkowski 2025-08-17 22:11:18 +02:00
• 7fd26ffed3 Fixed tomato farming again kziolkowski 2025-08-17 21:57:57 +02:00
• ce2d7eb773 WIP moving seed to plant matching into separate system, making fields independent of specific plants. kziolkowski 2025-08-15 18:42:17 +02:00
• 41365fb5d4 Fixed tool animation kziolkowski 2025-08-15 17:19:22 +02:00
• 96c7d35aa7 Added word wrapping to quest post it. kziolkowski 2025-08-15 17:18:52 +02:00
• c2f5359d0c changes after develop merge kziolkowski 2025-08-15 17:03:18 +02:00
• 9bebe1a44d Merge pull request 'Implemented first demo quest line' (#15) from feature/implement_quests into develop Jonathan 2025-08-14 23:28:09 +02:00
• 06a270e916 Renamed function to not sound like a unity signal feature/implement_quests jonathan 2025-08-14 23:27:15 +02:00
• b621df5435 removed invisible character jonathan 2025-08-14 23:16:52 +02:00
• 03dbc08293 quest status name refactoring jonathan 2025-08-14 21:54:18 +02:00
• 49fa5d08de Added fun button feature/languagetool-addon jonathan 2025-08-14 20:21:13 +02:00
• 1ee9dea9f6 Fixes in project jonathan 2025-08-14 06:30:38 +02:00
• d5fa2f88be Created LanguageTool Plugin jonathan 2025-08-14 06:30:17 +02:00
• 8676bbb2f6 Fix spelling jonathan 2025-08-13 17:13:33 +02:00
• 6e998810b6 Completed first demo quest line jonathan 2025-08-13 03:23:45 +02:00
• c96be7467e Added Quest field jonathan 2025-08-11 19:15:12 +02:00
• 6aa7530502 Added speed hack for vesna Jonathan 2025-08-06 21:25:28 +02:00
• d7ac1c6c22 Fixed retrigger yeli dialog Jonathan 2025-08-06 20:04:24 +02:00
• 0170a53b5a Added more quest stuff including dialogic quest condition Jonathan 2025-08-06 17:20:11 +02:00
• abc33fd06c Added first quests cblech 2025-07-23 20:48:56 +02:00
• 2fbeb93018 Dialogic quest addition and plugin fix cblech 2025-07-23 20:46:33 +02:00
• 9253a78a06 Merge pull request 'feature/showcase_bugfixing_kathi' (#14) from feature/showcase_bugfixing_kathi into develop Jonathan 2025-08-06 18:16:53 +02:00
• 0008b16d48 Adjusted moving values and animations to make vesna not slide any more kziolkowski 2025-08-02 15:32:13 +02:00
• 8e0dced918 Vesna can walk diagonally now kziolkowski 2025-08-02 15:08:38 +02:00
• 2e21fb7e98 Made sure splash screen features logo kziolkowski 2025-08-02 13:55:11 +02:00
• b69191e7f7 fixed pickup layering kziolkowski 2025-08-02 13:46:01 +02:00
• 8f75b5b644 Added secondary outline mat and assigned it to inventory items kziolkowski 2025-08-02 13:38:07 +02:00
• 6275bea52c MAde Vesna and Yeli disappear on dialogic start kziolkowski 2025-07-31 23:30:12 +02:00
• 279cac22ee Fixed dialogic settings kziolkowski 2025-07-31 23:25:43 +02:00
• e88ba2e1ef Updated interaction area setups to avoid nullrefs kziolkowski 2025-07-31 23:08:10 +02:00
• f01143e887 cleaned up dialogue structure and removed vesna2 from dialogues kziolkowski 2025-07-31 22:09:37 +02:00
• 18711776bb Fixed output error ERROR: Script class can only be set together with base class name kziolkowski 2025-07-31 21:44:17 +02:00
• 0f246825fc Added Wellbehaviour and fixed door interaction to offer outlines kziolkowski 2025-07-31 20:36:17 +02:00
• 19e30dd0b8 Removed disclaimer reference from bootstrap kziolkowski 2025-07-31 20:35:49 +02:00
• 730c4999d7 Extracted FightAttack Enum in the hopes of fixing errors kziolkowski 2025-07-31 20:35:14 +02:00
• cfe604d3b7 set duck body scale to 1,1 kziolkowski 2025-07-31 18:55:06 +02:00
• ad16b86171 wip exchanging interaction label with outline kziolkowski 2025-07-27 13:17:34 +02:00
• 5ee295256b Fixed Yeli Layering issue in indoor scene kziolkowski 2025-07-26 17:05:17 +02:00
• ab23d41496 Fixed ysorting on ducks and trash kziolkowski 2025-07-26 16:51:05 +02:00
• 12842a37ff Rigged Chuga Felix Paul 2025-07-25 20:19:39 +02:00
• ae0944fe00 Merge pull request 'feature/showcase_kathi' (#12) from feature/showcase_kathi into develop Jonathan 2025-07-23 12:37:47 +02:00
• 486cfb5546 WIP trying to fix the last plant stage bug on repeated farming rounds kziolkowski 2025-07-17 22:10:08 +02:00
• b92eb909ad Removed no longer needed print statements kziolkowski 2025-07-17 20:47:34 +02:00
• d2c7302ab2 Fixed farming (the way it was before) kziolkowski 2025-07-17 20:44:28 +02:00
• 5affc48dc5 Added scene transitions between fighting scene, credits, and start kziolkowski 2025-07-11 04:12:42 +02:00
• cdb6b83124 Merge remote-tracking branch 'origin/feature/fight_system' into feature/showcase_kathi kziolkowski 2025-07-11 03:55:56 +02:00
• a4f9511892 WIP fixing farming mechanic again kziolkowski 2025-07-11 03:55:36 +02:00
• cc7e8c5c4b Added Credits feature/fight_system cblech 2025-07-11 03:49:09 +02:00
• 7a3e96d679 Merge remote-tracking branch 'origin/feature/fight_system' into feature/showcase_kathi kziolkowski 2025-07-11 03:13:08 +02:00
• e38c391e1c Reworked flow to make it playable somehow kziolkowski 2025-07-11 03:12:29 +02:00
• c0e002f783 made you win waiting time shorter cblech 2025-07-11 03:01:49 +02:00
• e8850ca7c5 Added chuga dialog to fight scene cblech 2025-07-11 03:00:47 +02:00
• eaedf8c396 WIP Beetroot kziolkowski 2025-07-11 03:00:43 +02:00
• ffa20bbdf8 Added trash to first outdoor scene kziolkowski 2025-07-11 00:56:51 +02:00
• b77b6e3a52 Added second outdoor scene after tutorial kziolkowski 2025-07-11 00:17:31 +02:00
• 69cb63ad89 merge auto fixes cblech 2025-07-11 00:15:28 +02:00
• 11790434f5 Merge remote-tracking branch 'origin/feature/showcase_kathi' into feature/fight_system cblech 2025-07-11 00:11:33 +02:00
• c7d56301fc Added counter script to count ducks (and other things) kziolkowski 2025-07-10 23:58:33 +02:00
• 8bd2b09232 Added healing cblech 2025-07-10 23:32:16 +02:00
• 480d149ede SceneTransition Rework completed kziolkowski 2025-07-10 23:23:20 +02:00
• c6fc400994 Added second fight with mavkha cblech 2025-07-10 19:30:57 +02:00
• 16251db248 WIP new SceneTransition system kziolkowski 2025-07-10 19:07:46 +02:00
• 4752002caf Added action per round cblech 2025-07-10 18:29:18 +02:00
• 0e028a2cb9 Renamed signal cblech 2025-07-10 16:12:47 +02:00
• 01a281c2aa Fixed camera bounds cblech 2025-07-10 16:04:12 +02:00
• 2a46d363e9 Changed music to forrest cblech 2025-07-10 15:43:36 +02:00
• 92c3f5e054 Target only alive enemies cblech 2025-07-10 15:25:11 +02:00
• 6727339e9a Added audio to fight cblech 2025-07-10 04:39:33 +02:00
• e3d67722de Merge remote-tracking branch 'origin/Nao's-Sounds' into feature/fight_system cblech 2025-07-10 03:47:40 +02:00
• b6fd6292e3 Basic fighting system cblech 2025-07-10 03:38:48 +02:00
• e8c24e18be Added indoor bedroom scene kziolkowski 2025-07-10 01:25:52 +02:00
• 199d0873c8 Set up beetroot quest and added cat to indoor scene. kziolkowski 2025-07-10 01:19:00 +02:00
• e84ef716f6 Merge remote-tracking branch 'origin/feature_sanel-dialogic' into feature/showcase_kathi kziolkowski 2025-07-09 23:53:40 +02:00
• 135ba0d198 Reworked Domovoi kitchen animation and added AnimationStarter script kziolkowski 2025-07-09 23:50:43 +02:00
• 2940475062 Added dialog in Dialogic feature_sanel-dialogic Sanelschnitte 2025-07-09 23:43:02 +02:00
• 202f8809aa Fixed plant layering issue kziolkowski 2025-07-09 23:03:56 +02:00
• 28bb81c0b0 Added fence gates and fixed dialogic toggle for inventory kziolkowski 2025-07-09 22:58:36 +02:00
• b9c5de6dc3 Made labels visible on ducks kziolkowski 2025-07-09 22:49:07 +02:00
• 8c18688a69 MVP duck setup kziolkowski 2025-07-09 22:40:03 +02:00
• 2429958741 Added Disclaimer scene kziolkowski 2025-07-09 21:40:02 +02:00
• 6b5a8ee126 WIP duck behaviour kziolkowski 2025-07-09 20:52:43 +02:00
• 8d40529349 Changed StartScreen layout and added Quit button kziolkowski 2025-07-09 20:52:33 +02:00
• 9e97cc3b80 WIP duck pushing behaviour kziolkowski 2025-07-08 23:53:50 +02:00
• ebc3ee9cf9 Implemented basic duck running away from vesna mechanic kziolkowski 2025-07-08 22:23:28 +02:00
• a1bbe44105 Merge remote-tracking branch 'origin/Nao's-Sounds' into feature/showcase_kathi kziolkowski 2025-07-08 21:33:59 +02:00
• 3ce10c8ba9 Merge remote-tracking branch 'origin/Nao's-Sounds' into feature/showcase_kathi kziolkowski 2025-07-08 21:33:37 +02:00
• 7e6163ed68 updated project.godot kziolkowski 2025-07-07 21:16:36 +02:00
• 55d6222698 Added Camera to Indoor Common Room scene and renamend scene asset kziolkowski 2025-07-07 16:37:10 +02:00
• d7ad2ba072 reverted / recreated inventory changes kziolkowski 2025-07-07 16:14:07 +02:00
• 9c50a63dc3 Merge branch 'develop' into feature/showcase_kathi kziolkowski 2025-07-07 15:34:53 +02:00
• 746ac58329 Merge pull request 'Feature: Quest system' (#11) from feature/quest_system into develop kziolkowski 2025-07-07 15:24:28 +02:00
• a9cb20c8bc Fixed journal references feature/quest_system cblech 2025-07-07 04:51:35 +02:00
• 32249fde86 Made quest visuals cblech 2025-07-07 04:41:14 +02:00
• 27e137bc02 Made quest usable cblech 2025-07-07 04:41:03 +02:00