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

• 7ab513f01c Made that vesna can move to the beets scene feature/vesna_entity jonathan 2026-02-04 22:17:45 +01:00
• c7142111ed Made Player inventory saveable jonathan 2026-02-04 22:01:26 +01:00
• a6fa4315dc Moved the player inventory and selected slot to VesnaEntity jonathan 2026-02-04 21:32:24 +01:00
• 7841252809 Make Vesna entity save current position jonathan 2026-02-04 20:40:50 +01:00
• 1b77718b9b Added basic vesna entity jonathan 2026-02-04 20:25:54 +01:00
• 0bf3cc19c7 Changed naming stile for constants to CAPSLOCK jonathan 2026-02-04 19:57:46 +01:00
• 89321e917a Removed all outside connection to and from the Vesna prefabs jonathan 2026-02-04 19:43:49 +01:00
• 2cbf7e15a4 Changed camera no not need a direct reference to vesna jonathan 2026-02-04 19:40:10 +01:00
• 971d8d461b Made trash object delete its entity when collected feature/trash_object_entity_removable jonathan 2026-02-04 15:32:11 +01:00
• 628da80ed3 Merge pull request 'feature/entity_rework' (#52) from feature/entity_rework into develop develop Jonathan 2026-02-03 18:44:13 +01:00
• 0dfbd73978 Reverted ItemOnGround to make everything compile again feature/entity_rework Katharina Ziolkowski 2026-02-03 17:59:38 +01:00
• 8a93b00e72 Merge branch 'develop' into feature/entity_rework Katharina Ziolkowski 2026-02-03 17:53:28 +01:00
• ba7d550c3f Implemented Save and Load functionality Katharina Ziolkowski 2026-02-03 17:30:35 +01:00
• b65a3bbd6d Managed the freeing of entityplacers. Also cleaned up EntityManager Katharina Ziolkowski 2026-02-03 15:36:59 +01:00
• bcbc074c86 First adjustments to the Entity System to make it work with different types Katharina Ziolkowski 2026-02-03 13:55:13 +01:00
• 141418e24e Scene changes I made for storyboard screenshots feature/screenshots-storyboard Katharina Ziolkowski 2026-02-03 11:06:34 +01:00
• 1120f17202 shader adjustments to account for modulate value feature/shaders_with_modulate Katharina Ziolkowski 2026-02-01 14:00:21 +01:00
• bfe1be0145 added quick and dirty mock quest tmp/mock_qad_scripts jonathan 2026-01-29 19:19:58 +01:00
• 745f54b375 WIP jonathan 2026-01-29 17:42:32 +01:00
• 2c8a024528 Merge pull request 'feature/build_0_7' (#49) from feature/build_0_7 into develop kziolkowski 2026-01-27 13:04:21 +01:00
• 76eb408a40 Merge branch 'develop' into feature/build_0_7 kziolkowski 2026-01-27 13:01:34 +01:00
• ff143f07e7 deleted unused autosave file Katharina Ziolkowski 2026-01-27 13:00:38 +01:00
• 3bd70f221e Minigame click max 3 mal Minigame_extra_click jlink 2026-01-15 11:41:50 +01:00
• b50ca5b919 Merge pull request 'einfügen von Gesichtsausdrücken für Vesna' (#46) from Vesna_Gesichtsausdrücke_einfügen_ into develop Jonathan 2026-01-13 23:43:46 +01:00
• 5636c0da67 Add first two cat animations feature/spine2D_experimental saderako 2025-12-22 12:30:31 +01:00
• 4578a2cfda Added Spine2D GDExtension bin to project kziolkowski 2025-12-22 10:48:51 +01:00
• 5b0f00a048 SFX Added for Mavka and Slimes Defeated Nao's-Sounds Nao 2025-12-18 15:45:07 +01:00
• 59d313d97d Added basic entity scripts jonathan 2025-12-18 14:27:27 +01:00
• 9032272599 Merge pull request 'BlobFighter TargetSelection ColliderShape2D Transform angepasst' (#42) from Enemy_selection_overlap into develop Jonathan 2025-12-18 13:06:03 +01:00
• a2ef3bfaf0 Window angepasst Enemy_selection_overlap jlink 2025-12-18 13:02:32 +01:00
• 1ab1071246 HoverIndicator off jlink 2025-12-17 15:29:58 +01:00
• b0ee8c4c58 fixed path strings in scene transitions and added disclaimer and credits back into the flow kziolkowski 2025-12-17 01:07:39 +01:00
• 522fdfa365 Added fightworld background and cat dialogue kziolkowski 2025-12-17 00:40:43 +01:00
• 4f6c5ab9c1 fixed some layering issues in beetroot scene and added a mock convo with the domovoi kziolkowski 2025-12-17 00:15:42 +01:00
• 11e24e249e Fixed Field outline not disappearing when switching tools kziolkowski 2025-12-16 23:29:48 +01:00
• f3080df4b7 moved fence door collision shape up to reduce unwanted triggering kziolkowski 2025-12-16 23:13:38 +01:00
• f6e83e7fef Added event handlers in Fieldbehaviour to react to watering can state changes kziolkowski 2025-12-16 23:13:09 +01:00
• 3bdc8cd03f Deactivated harvestable plant on spawn kziolkowski 2025-12-16 23:06:58 +01:00
• f862827d98 Removed Print statements kziolkowski 2025-12-16 23:06:41 +01:00
• a401cbe5b9 🐛 fixed field activator self-deactivating on load bug kziolkowski 2025-12-16 22:53:22 +01:00
• 48660b167c Merge branch 'feature/bugfixes_polish_II' into feature/build_0_7 kziolkowski 2025-12-16 21:59:04 +01:00
• 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 +01:00
• 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 +01:00
• 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 +01:00
• edc133749f Merge pull request 'Randomized who starts the fight' (#41) from randomise_fight_start into develop Jonathan 2025-12-16 19:28:37 +01:00
• 5f75bde317 💄 Made heal button show how many beats are left feature/farm_fight_loop jonathan 2025-12-16 19:24:20 +01:00
• 7310bfbf6e ✨Added flying beet to the ui when used jonathan 2025-12-16 18:56:18 +01:00
• fef8380a57 ✨When beetroot is in inventory the player can heal jonathan 2025-12-11 17:13:28 +01:00
• f42c2c86b1 ✨ Defeated enemygroups now drop a beet_seed jonathan 2025-12-11 15:09:28 +01:00
• f1a2e6166b 🐛 fixed field setup in beet scene kziolkowski 2025-12-16 18:09:51 +01:00
• c0111e4c17 🐛 fixed rake triggering field interaction + watering can interaction kziolkowski 2025-12-16 16:43:46 +01:00
• 2ed9dbbc52 Vesna resets to bed after death Vesna_resets_to_bed_after_dead jlink 2025-12-16 15:34:52 +01:00
• 4f660c4af8 🐛 fixed rake still activating field outlines bug kziolkowski 2025-12-16 15:11:32 +01:00
• 13fcf059e9 Added trash object savestate kziolkowski 2025-12-16 15:03:27 +01:00
• 7f58aeae76 removed GD.Prints kziolkowski 2025-12-16 14:33:54 +01:00
• 3456340bb7 einfügen von Gesichtsausdrücken für Vesna Vesna_Gesichtsausdrücke_einfügen_ jlink 2025-12-16 14:30:23 +01:00
• 30750d2e3c ♻️ removed planted state from Fieldstate because it didn't make any sense. kziolkowski 2025-12-16 14:27:12 +01:00
• 950731b225 🐛 Fixed ObjectNotDisposedException on Well in beetroot scene kziolkowski 2025-12-16 13:46:28 +01:00
• feb591f56a ♻️ modified changed path in start scene kziolkowski 2025-12-16 13:46:07 +01:00
• aac0992590 ♻️ scene name refactoring part two: fixing scene transition paths in scenes kziolkowski 2025-12-16 13:34:32 +01:00
• 21cf2d1a6a ♻️ Renamed scenes kziolkowski 2025-12-16 13:17:39 +01:00
• 3f5cfed477 removed test scene kziolkowski 2025-12-16 13:14:46 +01:00
• 64c15c2e63 removed print statements kziolkowski 2025-12-16 13:14:25 +01:00
• a98c842ee0 🐛 Fixed field interaction bug kziolkowski 2025-12-16 13:04:40 +01:00
• abed751d29 🚧 WIP trying to make fields have outlines again kziolkowski 2025-12-15 22:45:02 +01:00
• ce113e16da 🐛 planting seeds works again kziolkowski 2025-12-15 21:33:04 +01:00
• c55e527bf4 Merge branch 'develop' into feature/bugfixes_polish_II kziolkowski 2025-12-15 20:41:44 +01:00
• c509a52001 🚧 Basic interaction works now too kziolkowski 2025-12-12 13:49:16 +01:00
• 9e0e87ef17 🚧 WIP detection works now kziolkowski 2025-12-12 13:46:32 +01:00
• 7ffbb8e68d pulled ceiling lower in kitchen scene kziolkowski 2025-12-12 10:34:52 +01:00
• 6375383373 🐛Made attack selection only select alive enemies bug/attack_dead_enemy jonathan 2025-12-11 18:49:51 +01:00
• b810ea1d9f Merge pull request 'Kampf Tooltip wird ausgeblendet' (#43) from Kampf_Tooltip into develop Jonathan 2025-12-11 17:29:54 +01:00
• b232cb31c3 🚧 interaction kinda sorta works now, still needs tweaking kziolkowski 2025-12-10 16:57:39 +01:00
• a6260efc07 Merge branch 'develop' into feature/bugfixes_polish_II kziolkowski 2025-12-10 16:24:18 +01:00
• 3d19509826 Merge pull request 'feature/art_update' (#40) from feature/art_update into develop kziolkowski 2025-12-10 16:23:41 +01:00
• 113dd0820f Merge branch 'develop' into feature/art_update kziolkowski 2025-12-10 16:23:04 +01:00
• 7e148cd9fe 🐛 fixed Ysorting issues in fightworld kziolkowski 2025-12-10 16:21:48 +01:00
• 59489e4a17 Made common room into hub area and ajdusted Yeli dialogue kziolkowski 2025-12-10 16:02:38 +01:00
• fc00559483 Kampf Tooltip wird ausgeblendet Kampf_Tooltip jlink 2025-12-10 15:53:55 +01:00
• 982178d89a 🐛 fixed sunflower parallaxing to *perfection* kziolkowski 2025-12-10 15:34:45 +01:00
• 09f55d3aa7 BlobFighter TargetSelection ColliderShape2D Transform angepasst jlink 2025-12-10 15:29:56 +01:00
• c89685c936 🐛 fixed colliders in kitchen kziolkowski 2025-12-10 15:15:01 +01:00
• 79108fbe15 🐛 fixed parallax problems kziolkowski 2025-12-10 15:12:43 +01:00
• 9499c27444 🚧 WIP: trying to rework the detection system (it fails) kziolkowski 2025-12-09 17:51:00 +01:00
• 0434667c22 Merge pull request 'feature/bugfixes_And_Polish' (#39) from feature/bugfixes_And_Polish into develop Jonathan 2025-12-09 15:20:36 +01:00
• a736adaafb Randomized who starts the fight randomise_fight_start jonathan 2025-12-09 15:07:50 +01:00
• bef54420e4 darkened fightworld room to make it look more like night kziolkowski 2025-12-07 10:54:54 +01:00
• 9267278ce8 tried and failed at fixing all layering issues in beet scene kziolkowski 2025-12-07 10:43:41 +01:00
• 9ba83dfddd Made stove interactable kziolkowski 2025-12-07 10:26:20 +01:00
• 7c5ba2d6bb Added kitchen room kziolkowski 2025-12-07 10:22:02 +01:00
• 0c5fc26d2f 🍱 changed forest background in first farming scene kziolkowski 2025-12-07 09:18:55 +01:00
• e51e0a24d2 🐛 fixed dialogic bugs and moved trash items out of the way kziolkowski 2025-12-06 21:46:54 +01:00
• 7bb523f9e7 🐛 harvested plants don't come back on scene reload kziolkowski 2025-12-06 20:47:56 +01:00
• a3651d6268 deleted unused code kziolkowski 2025-12-06 20:40:47 +01:00
• 0892a13e66 🐛 fixed beet harvesting kziolkowski 2025-12-06 20:36:22 +01:00
• 61caa6eea6 Merge branch 'refs/heads/develop' into feature/bugfixes_And_Polish kziolkowski 2025-12-06 19:59:31 +01:00
• 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 +01:00
• b7d1f9d8d5 Merge branch 'develop' into minigame_hit_feedback minigame_hit_feedback kziolkowski 2025-12-06 19:54:05 +01:00
• 12bf632932 Merge pull request 'Added randomnes into attack minigame' (#36) from minigame_variation into develop kziolkowski 2025-12-06 19:53:49 +01:00
• 0d985e5bf6 Merge branch 'develop' into minigame_variation minigame_variation kziolkowski 2025-12-06 19:53:44 +01:00