feature/showcase_kathi #12

Merged
Jonathan merged 73 commits from feature/showcase_kathi into develop 9 months ago

73 Commits (develop)

Author SHA1 Message Date
Katharina Ziolkowski 5affc48dc5 Added scene transitions between fighting scene, credits, and start
9 months ago
Katharina Ziolkowski cdb6b83124 Merge remote-tracking branch 'origin/feature/fight_system' into feature/showcase_kathi
9 months ago
Katharina Ziolkowski a4f9511892 WIP fixing farming mechanic again
9 months ago
cblech cc7e8c5c4b Added Credits
9 months ago
Katharina Ziolkowski 7a3e96d679 Merge remote-tracking branch 'origin/feature/fight_system' into feature/showcase_kathi
9 months ago
Katharina Ziolkowski e38c391e1c Reworked flow to make it playable somehow
9 months ago
cblech c0e002f783 made you win waiting time shorter
9 months ago
cblech e8850ca7c5 Added chuga dialog to fight scene
9 months ago
Katharina Ziolkowski eaedf8c396 WIP Beetroot
9 months ago
Katharina Ziolkowski ffa20bbdf8 Added trash to first outdoor scene
9 months ago
Katharina Ziolkowski b77b6e3a52 Added second outdoor scene after tutorial
9 months ago
cblech 69cb63ad89 merge auto fixes
9 months ago
cblech 11790434f5 Merge remote-tracking branch 'origin/feature/showcase_kathi' into feature/fight_system
9 months ago
Katharina Ziolkowski c7d56301fc Added counter script to count ducks (and other things)
9 months ago
cblech 8bd2b09232 Added healing
9 months ago
Katharina Ziolkowski 480d149ede SceneTransition Rework completed
9 months ago
cblech c6fc400994 Added second fight with mavkha
9 months ago
Katharina Ziolkowski 16251db248 WIP new SceneTransition system
9 months ago
cblech 4752002caf Added action per round
9 months ago
cblech 0e028a2cb9 Renamed signal
9 months ago
cblech 01a281c2aa Fixed camera bounds
9 months ago
cblech 2a46d363e9 Changed music to forrest
9 months ago
cblech 92c3f5e054 Target only alive enemies
9 months ago
cblech 6727339e9a Added audio to fight
9 months ago
cblech e3d67722de Merge remote-tracking branch 'origin/Nao's-Sounds' into feature/fight_system
9 months ago
cblech b6fd6292e3 Basic fighting system
9 months ago
Katharina Ziolkowski e8c24e18be Added indoor bedroom scene
9 months ago
Katharina Ziolkowski 199d0873c8 Set up beetroot quest and added cat to indoor scene.
9 months ago
Katharina Ziolkowski e84ef716f6 Merge remote-tracking branch 'origin/feature_sanel-dialogic' into feature/showcase_kathi
9 months ago
Katharina Ziolkowski 135ba0d198 Reworked Domovoi kitchen animation and added AnimationStarter script
9 months ago
Sanelschnitte 2940475062 Added dialog in Dialogic
9 months ago
Katharina Ziolkowski 202f8809aa Fixed plant layering issue
9 months ago
Katharina Ziolkowski 28bb81c0b0 Added fence gates and fixed dialogic toggle for inventory
9 months ago
Katharina Ziolkowski b9c5de6dc3 Made labels visible on ducks
9 months ago
Katharina Ziolkowski 8c18688a69 MVP duck setup
9 months ago
Katharina Ziolkowski 2429958741 Added Disclaimer scene
9 months ago
Katharina Ziolkowski 6b5a8ee126 WIP duck behaviour
9 months ago
Katharina Ziolkowski 8d40529349 Changed StartScreen layout and added Quit button
9 months ago
Katharina Ziolkowski 9e97cc3b80 WIP duck pushing behaviour
9 months ago
Katharina Ziolkowski ebc3ee9cf9 Implemented basic duck running away from vesna mechanic
9 months ago
Katharina Ziolkowski a1bbe44105 Merge remote-tracking branch 'origin/Nao's-Sounds' into feature/showcase_kathi
9 months ago
Katharina Ziolkowski 3ce10c8ba9 Merge remote-tracking branch 'origin/Nao's-Sounds' into feature/showcase_kathi
9 months ago
Katharina Ziolkowski 7e6163ed68 updated project.godot
9 months ago
Katharina Ziolkowski 55d6222698 Added Camera to Indoor Common Room scene and renamend scene asset
9 months ago
Katharina Ziolkowski d7ad2ba072 reverted / recreated inventory changes
9 months ago
Katharina Ziolkowski 9c50a63dc3 Merge branch 'develop' into feature/showcase_kathi
9 months ago
Katharina Ziolkowski ec653aa847 readded camera ref to farming behaviour
9 months ago
Katharina Ziolkowski 9acea54f28 Added duck sprite
9 months ago
Katharina Ziolkowski 2f5296e05a Diversified field shapes
9 months ago
Katharina Ziolkowski e8a58655ad Added grass textures and field borders
9 months ago
Katharina Ziolkowski aa3789566c Duplicated sunflower field parallaxe layer to ensure seamlessness on big screens
9 months ago
Katharina Ziolkowski 9c7ae20c18 Reworked Camera controls outside scene
9 months ago
Nao 9f04c8819f SFX for Mavkas (Voices but more "ghostly") Added
9 months ago
Nao 6cd7be196b SFX Wolf + Mavka Voices (when hit in battle) Added
9 months ago
Katharina Ziolkowski ab2cf3f497 wateringcanstate uid?
9 months ago
Katharina Ziolkowski bf096aa716 visual improvements on farm scene
9 months ago
Nao 6de8368414 Farm Atmos Added
9 months ago
Nao d20085a67c SFX Water Attack Added (Vesna + Slimes)
9 months ago
Nao 648ae8395b SFX added for Root Attack, Mavka + Vesna
9 months ago
Nao b68eb0953e SFX Duck Flügelflattern "Wings" + Schlappentornado Added
9 months ago
Nao 7eb18caaaf Added SFX for Healing magic
9 months ago
Nao e65e82f421 Added SFX Duck & Combat, moved Cat SFX to folder "animals"
9 months ago
Nao 691e613a5c Added SFX for Combat
10 months ago
Nao 250f0d07ca SFX Slime Hit Variations (Pitch) Added
10 months ago
Nao f481f5bea7 SFX Added: UI (Dialog + Confirmation), Slime Hit
10 months ago
Nao b8cb60aec9 Placeholder for Quest Fail added
10 months ago
Nao 55a3e56791 New SFX for Door added
10 months ago
Nao 4261789f13 SFX Quest Complete Placeholder added (need more time)
11 months ago
Nao ce18c89c09 Farm Atmos Nighttime added
11 months ago
Nao 7643cccebf New SFX and Forest Atmos Nighttime added
11 months ago
Nao 7e4d733d7c SFX for kitchen added (cutlery, plates, etc) and a few renamed
11 months ago
Nao 1dcd900737 SFX Snoring Added
11 months ago
Nao 74c3540c96 SFX Door Open and Close added
11 months ago