Commit Graph

96 Commits (f1b980cdb6ce614e4aa33551176810df9d137e39)

Author SHA1 Message Date
Katharina Ziolkowski 8b77ca9bc5 ♻️ migrated the InteractionAreas currently used to the new format and removed the old code
6 months ago
Katharina Ziolkowski 66848af8bf Merge branch 'develop' into feature/farming_bugfixes_and_magic_word
6 months ago
jonathan f27f69c15f 🐛 Rebase fixing
6 months ago
jonathan 8bb1c22549 Added minigame to attack action
6 months ago
jonathan 8624e2aea8 Added minigame
6 months ago
jonathan 0e315396c9 Made fight fightable
6 months ago
jonathan fd0e631b1f Bootstrap fight system
6 months ago
Katharina Ziolkowski b54f784d51 🎨 Replaced pickup animation group call with event
6 months ago
Katharina Ziolkowski 6194988bf0 🎨 removed plant growing call group and replaced it with an event call. Made FarmingAnimation play on event.
6 months ago
Katharina Ziolkowski 1f13f3ea51 Merge branch 'develop' into feature/detection_cross
6 months ago
Katharina Ziolkowski 3fe79f2fd8 Added VariableGetter functionality and some Variable setting components. Also added them to test scene.
6 months ago
Katharina Ziolkowski c96e6da78e Separated events from variables and adjusted test scene
6 months ago
Katharina Ziolkowski 078e26e868 Implemented dialogue box design as described in mockups
6 months ago
Katharina Ziolkowski ffebe10593 💄 Added new fonts and increased textbox size. Also added border line.
6 months ago
Katharina Ziolkowski 4c8406ba97 upgraded project to 4.5
6 months ago
Katharina Ziolkowski a74abe684b Godot upgrade to 4.5
6 months ago
Katharina Ziolkowski a593be8273 📝 added documentation and improved event scope
6 months ago
Katharina Ziolkowski 1e004b62b8 Implemented first version of EventResources
6 months ago
Katharina Ziolkowski 936983e14f 💄 updated dialogic style to make it clearer who is talking and have vesna always on the left side
7 months ago
Katharina Ziolkowski 1f88f9b4b5 Added beetroot as growable plant
7 months ago
Katharina Ziolkowski d1a8ff0cbf WIP reworking the item repository
8 months ago
Katharina Ziolkowski 652cac4232 Added typing sounds to dialogic characters
8 months ago
Katharina Ziolkowski 4734ae953c Added option to play pickup animation for non-inventory items
8 months ago
Katharina Ziolkowski 7fd26ffed3 Fixed tomato farming again
8 months ago
Katharina Ziolkowski ce2d7eb773 WIP moving seed to plant matching into separate system, making fields independent of specific plants.
8 months ago
Katharina Ziolkowski c2f5359d0c changes after develop merge
8 months ago
jonathan 6e998810b6 Completed first demo quest line
9 months ago
jonathan c96be7467e Added Quest field
9 months ago
Jonathan 6aa7530502 Added speed hack for vesna
9 months ago
Jonathan d7ac1c6c22 Fixed retrigger yeli dialog
9 months ago
Jonathan 0170a53b5a Added more quest stuff including dialogic quest condition
9 months ago
cblech abc33fd06c Added first quests
9 months ago
Katharina Ziolkowski 8e0dced918 Vesna can walk diagonally now
9 months ago
Katharina Ziolkowski 2e21fb7e98 Made sure splash screen features logo
9 months ago
Katharina Ziolkowski f01143e887 cleaned up dialogue structure and removed vesna2 from dialogues
9 months ago
Katharina Ziolkowski 5ee295256b Fixed Yeli Layering issue in indoor scene
9 months ago
Katharina Ziolkowski a4f9511892 WIP fixing farming mechanic again
10 months ago
Katharina Ziolkowski 7a3e96d679 Merge remote-tracking branch 'origin/feature/fight_system' into feature/showcase_kathi
10 months ago
Katharina Ziolkowski eaedf8c396 WIP Beetroot
10 months ago
cblech 69cb63ad89 merge auto fixes
10 months ago
cblech 11790434f5 Merge remote-tracking branch 'origin/feature/showcase_kathi' into feature/fight_system
10 months ago
Katharina Ziolkowski 480d149ede SceneTransition Rework completed
10 months ago
cblech b6fd6292e3 Basic fighting system
10 months ago
Katharina Ziolkowski e84ef716f6 Merge remote-tracking branch 'origin/feature_sanel-dialogic' into feature/showcase_kathi
10 months ago
Sanelschnitte 2940475062 Added dialog in Dialogic
10 months ago
Katharina Ziolkowski 2429958741 Added Disclaimer scene
10 months ago
Katharina Ziolkowski 7e6163ed68 updated project.godot
10 months ago
Katharina Ziolkowski d7ad2ba072 reverted / recreated inventory changes
10 months ago
cblech a9cb20c8bc Fixed journal references
10 months ago
cblech 32249fde86 Made quest visuals
10 months ago