Jonathan/Babushka
2
0
Fork 0
Code Pull Requests 1 Releases Activity

feature/showcase_kathi #12

Merged
Jonathan merged 73 commits from feature/showcase_kathi into develop 2025-07-23 12:37:50 +02:00
Conversation 0 Commits 73 Files Changed 382
+15119 -296
kziolkowski commented 2025-07-15 19:12:03 +02:00
Owner
Copy Link
Copy Source

State of the project at IGF 2025:
First playable prototype completed.

  • Ducks implemented as interaction areas
  • farming step growing broken
  • beet-quest only partially implemented and removed from prototype flow
  • fighting-scene in forest and dialogue with chuga implemented
  • disclaimer scene and credits added
State of the project at IGF 2025: First playable prototype completed. - Ducks implemented as interaction areas - farming step growing broken - beet-quest only partially implemented and removed from prototype flow - fighting-scene in forest and dialogue with chuga implemented - disclaimer scene and credits added
kziolkowski added 73 commits 2025-07-15 19:12:05 +02:00
SFX Door Open and Close added 74c3540c96
SFX Snoring Added 1dcd900737
SFX for kitchen added (cutlery, plates, etc) and a few renamed 7e4d733d7c
New SFX and Forest Atmos Nighttime added 7643cccebf
Farm Atmos Nighttime added ce18c89c09
SFX Quest Complete Placeholder added (need more time) 4261789f13
New SFX for Door added 55a3e56791
Placeholder for Quest Fail added b8cb60aec9
SFX Added: UI (Dialog + Confirmation), Slime Hit f481f5bea7
SFX Slime Hit Variations (Pitch) Added 250f0d07ca
Added SFX for Combat 691e613a5c
Added SFX Duck & Combat, moved Cat SFX to folder "animals" e65e82f421
Added SFX for Healing magic 7eb18caaaf
SFX Duck Flügelflattern "Wings" + Schlappentornado Added b68eb0953e
SFX added for Root Attack, Mavka + Vesna 648ae8395b
SFX Water Attack Added (Vesna + Slimes) d20085a67c
Farm Atmos Added 6de8368414
visual improvements on farm scene bf096aa716
wateringcanstate uid? ab2cf3f497
SFX Wolf + Mavka Voices (when hit in battle) Added 6cd7be196b
SFX for Mavkas (Voices but more "ghostly") Added 9f04c8819f
Reworked Camera controls outside scene 9c7ae20c18
Duplicated sunflower field parallaxe layer to ensure seamlessness on big screens aa3789566c
Added grass textures and field borders e8a58655ad
Diversified field shapes 2f5296e05a
Added duck sprite 9acea54f28
readded camera ref to farming behaviour ec653aa847
Merge branch 'develop' into feature/showcase_kathi 9c50a63dc3
reverted / recreated inventory changes d7ad2ba072
Added Camera to Indoor Common Room scene and renamend scene asset 55d6222698
updated project.godot 7e6163ed68
Merge remote-tracking branch 'origin/Nao's-Sounds' into feature/showcase_kathi 3ce10c8ba9
Merge remote-tracking branch 'origin/Nao's-Sounds' into feature/showcase_kathi a1bbe44105
Implemented basic duck running away from vesna mechanic ebc3ee9cf9
WIP duck pushing behaviour 9e97cc3b80
Changed StartScreen layout and added Quit button 8d40529349
WIP duck behaviour 6b5a8ee126
Added Disclaimer scene 2429958741
MVP duck setup 8c18688a69
Made labels visible on ducks b9c5de6dc3
Added fence gates and fixed dialogic toggle for inventory 28bb81c0b0
Fixed plant layering issue 202f8809aa
Added dialog in Dialogic 2940475062 
basic char, text, choice - eventually needs more events and functions to work properly
Reworked Domovoi kitchen animation and added AnimationStarter script 135ba0d198
Merge remote-tracking branch 'origin/feature_sanel-dialogic' into feature/showcase_kathi e84ef716f6 
# Conflicts:
#	project.godot
Set up beetroot quest and added cat to indoor scene. 199d0873c8
Added indoor bedroom scene e8c24e18be
Basic fighting system b6fd6292e3
Merge remote-tracking branch 'origin/Nao's-Sounds' into feature/fight_system e3d67722de
Added audio to fight 6727339e9a
Target only alive enemies 92c3f5e054
Changed music to forrest 2a46d363e9
Fixed camera bounds 01a281c2aa
Renamed signal 0e028a2cb9
Added action per round 4752002caf
WIP new SceneTransition system 16251db248
Added second fight with mavkha c6fc400994
SceneTransition Rework completed 480d149ede
Added healing 8bd2b09232
Added counter script to count ducks (and other things) c7d56301fc
Merge remote-tracking branch 'origin/feature/showcase_kathi' into feature/fight_system 11790434f5
merge auto fixes 69cb63ad89
Added second outdoor scene after tutorial b77b6e3a52
Added trash to first outdoor scene ffa20bbdf8
WIP Beetroot eaedf8c396
Added chuga dialog to fight scene e8850ca7c5
made you win waiting time shorter c0e002f783
Reworked flow to make it playable somehow e38c391e1c
Merge remote-tracking branch 'origin/feature/fight_system' into feature/showcase_kathi 7a3e96d679
Added Credits cc7e8c5c4b
WIP fixing farming mechanic again a4f9511892
Merge remote-tracking branch 'origin/feature/fight_system' into feature/showcase_kathi cdb6b83124
Added scene transitions between fighting scene, credits, and start 5affc48dc5
kziolkowski requested review from Jonathan 2025-07-15 19:12:18 +02:00
Jonathan merged commit ae0944fe00 into develop 2025-07-23 12:37:50 +02:00
Sign in to join this conversation.
Reviewers
No Reviewers
Jonathan
Labels
No items
No Label
Milestone
No items
No Milestone
Assignees
Clear assignees
ascheck (Anna Scheck) jlink kziolkowski (Katharina Ziolkowski) lkrause Nao Palurdas saderako Sanelschnitte Jonathan
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: Jonathan/Babushka#12
Delete Branch "feature/showcase_kathi"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?