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

First intro sequence with Yeli #9

Merged
Jonathan merged 28 commits from feature/yeli_intro into develop 2025-06-17 02:40:14 +02:00
Conversation 1 Commits 28 Files Changed 306
+4732 -118
kziolkowski commented 2025-06-16 20:35:03 +02:00
Owner
Copy Link
Copy Source

Status after build version 0.2

Was ich konkret gemacht hab:

  • Einen Ablauf mit StartScreen, Outdoor-Szene und Indoor-Szene gebaut
  • Yeli mit Idle- und Sprechanimationen eingebaut
  • Ein paar einfache Dialogic-Timelines runtergeschrieben, in denen Yeli uns die Steuerung erklärt.
  • Background-Music eingebaut
  • Erste SFX eingebaut (Farming, Fill Wateringcan und water fields)

Also pushes changes from Nao's sound branch and Palurdas' Animation branch

Status after build version 0.2 Was ich konkret gemacht hab: - Einen Ablauf mit StartScreen, Outdoor-Szene und Indoor-Szene gebaut - Yeli mit Idle- und Sprechanimationen eingebaut - Ein paar einfache Dialogic-Timelines runtergeschrieben, in denen Yeli uns die Steuerung erklärt. - Background-Music eingebaut - Erste SFX eingebaut (Farming, Fill Wateringcan und water fields) Also pushes changes from Nao's sound branch and Palurdas' Animation branch
kziolkowski added 30 commits 2025-06-16 20:35:03 +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
Rerender Harvesting and added Watering animations 3eb35d4e7d
Added Yeli Idle and Talk animations 20ed134628
New SFX for Door added 55a3e56791
Placeholder for Quest Fail added b8cb60aec9
Merge remote-tracking branch 'origin/Nao's-Sounds' into feature/yeli_intro a9ab463353
Merge remote-tracking branch 'origin/Animations' into feature/yeli_intro 9968e7aa91
moved player2D prefab 15bd20adb4
Added Yeli sprites and dialogic test timeline as well as prefab cc87f058ba
import statements b473f5a7c6
Added first working timeline for yelis intro to farming scene 2f0055774c
Added Cozy Raven Splashscreen d6e777d468
Extended dialogic toggle b9131336d0
Fixed Yeli Y sorting issue and made fields rounded d88812aacd
Updated Startscreen and added second tutorial step 89820529ee
Added last farming timelines and fixed some minor issues 6def053d22
WIP trying to toggle interactable colliders at runtime for fields e04f9f65d4
changed label settings for InteractionArea 36aab734e1
Added Background music 944bde4702
Added Farming SFX 0853855237
Added WateringCan SFX 28e13e4e80
Added indoor ending 8b8293ee85
fixed missing ready plants f8c2e00681
changed export presets for new builds 622093fc59
Added art for updated startscreen to project (but not yet to start menu scene) 86387b6a18
kziolkowski marked the pull request as work in progress 2025-06-16 20:36:11 +02:00
kziolkowski requested review from Jonathan 2025-06-16 20:36:19 +02:00
kziolkowski changed title from WIP: feature/yeli_intro to First intro sequence with Yeli 2025-06-16 20:37:27 +02:00
Jonathan force-pushed feature/yeli_intro from 86387b6a18 to 83c8a15e5a 2025-06-17 02:23:12 +02:00 Compare
Jonathan approved these changes 2025-06-17 02:40:01 +02:00
Jonathan merged commit 58c65fc928 into develop 2025-06-17 02:40:14 +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
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: Jonathan/Babushka#9
Delete Branch "feature/yeli_intro"

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?