Jonathan
/
Babushka
2
0
Fork 0
Code Pull Requests 1 Releases Activity
515 Commits
46 Branches
0 Tags
5.7 GiB
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'edc133749f'
${ noResults }
Commit Graph

235 Commits (edc133749fbd1b41b3abee5944051288f1929b01)

Author SHA1 Message Date
jonathan 3326bde40c 🐛Exiting fight happening when one side wins
5 months ago
jonathan 8bb1c22549 Added minigame to attack action
5 months ago
jonathan 8624e2aea8 Added minigame
5 months ago
jonathan f4d8ed87e2 Added blob attack action
5 months ago
jonathan 9bf25640f6 Added basic action animation
5 months ago
jonathan 0e315396c9 Made fight fightable
5 months ago
jonathan f27dd199b8 Fight happening base setup
5 months ago
jonathan fd0e631b1f Bootstrap fight system
5 months ago
Katharina Ziolkowski af8807610d :bug increased interaction area size for fence gates
6 months ago
Katharina Ziolkowski 02b6584e44 🐛 fixed ObjectDisposedException from the Inventory when switching scenes.
6 months ago
Katharina Ziolkowski e202534c6b 🐛 Vesnas Namensschild sieht nicht richtig aus FIXED
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 e1b1a2f447 🔧 adjusted seed pickup positions and indoor collider sizes
6 months ago
Katharina Ziolkowski 2d4e853ec8 🍱 Adjusted colliders in farm_outside scene and reactivated ground collider on Vesna
6 months ago
Katharina Ziolkowski ffebe10593 💄 Added new fonts and increased textbox size. Also added border line.
6 months ago
Katharina Ziolkowski 5bcbee8865 created test scene and removed event test elements from start scene
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 5fc7b3d563 scene updates after undoing changes to interactionArea
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 e73f13d7d4 🎨 💄 Created art template for farm plants and reworked existing plant prefabs and inventory resources
7 months ago
Katharina Ziolkowski 0713e334b3 Fixed InventoryInstance behaviour
7 months ago
Katharina Ziolkowski c56f654751 Set up second garden with beetroot, built transition from yard and back
7 months ago
Katharina Ziolkowski 1f88f9b4b5 Added beetroot as growable plant
7 months ago
Katharina Ziolkowski 06fd80f762 grass layering fix
7 months ago
Katharina Ziolkowski 2cb605261e Fixed Tomato farming (again)
7 months ago
Katharina Ziolkowski d1a8ff0cbf WIP reworking the item repository
7 months ago
Katharina Ziolkowski e44e06bace Added Footsteps SFX
8 months ago
Katharina Ziolkowski 871e1856f1 Tools get deactivated from animation when switching to an empty slot in the inventory. Also fixed layering (AGAIN)
8 months ago
Katharina Ziolkowski 378bf45c49 Implemented PR feedback + made sure initial farming quests run smoothly
8 months ago
Katharina Ziolkowski f6e0c4e615 minor scene fixes
8 months ago
Katharina Ziolkowski 6ae877f2ab Implemented first version of an interactable area that reacts to inventory selection
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 96c7d35aa7 Added word wrapping to quest post it.
8 months ago
Katharina Ziolkowski c2f5359d0c changes after develop merge
8 months ago
jonathan 06a270e916 Renamed function to not sound like a unity signal
8 months ago
jonathan 03dbc08293 quest status name refactoring
8 months ago
jonathan 6e998810b6 Completed first demo quest line
8 months ago
jonathan c96be7467e Added Quest field
8 months ago
Jonathan d7ac1c6c22 Fixed retrigger yeli dialog
8 months ago
Jonathan 0170a53b5a Added more quest stuff including dialogic quest condition
8 months ago
cblech abc33fd06c Added first quests
8 months ago
Katharina Ziolkowski b69191e7f7 fixed pickup layering
8 months ago
Katharina Ziolkowski 8f75b5b644 Added secondary outline mat and assigned it to inventory items
8 months ago
Katharina Ziolkowski e88ba2e1ef Updated interaction area setups to avoid nullrefs
9 months ago
Katharina Ziolkowski f01143e887 cleaned up dialogue structure and removed vesna2 from dialogues
9 months ago
Katharina Ziolkowski 0f246825fc Added Wellbehaviour and fixed door interaction to offer outlines
9 months ago
Katharina Ziolkowski 19e30dd0b8 Removed disclaimer reference from bootstrap
9 months ago
Katharina Ziolkowski ad16b86171 wip exchanging interaction label with outline
9 months ago
Katharina Ziolkowski 5ee295256b Fixed Yeli Layering issue in indoor scene
9 months ago
Katharina Ziolkowski ab23d41496 Fixed ysorting on ducks and trash
9 months ago
Katharina Ziolkowski d2c7302ab2 Fixed farming (the way it was before)
9 months ago
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 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 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 01a281c2aa Fixed camera bounds
9 months ago
cblech 2a46d363e9 Changed music to forrest
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 135ba0d198 Reworked Domovoi kitchen animation and added AnimationStarter script
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 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
cblech 32249fde86 Made quest visuals
9 months ago
cblech 27e137bc02 Made quest usable
9 months ago
cblech 01daddee3b Made basic quest setup
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 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
Katharina Ziolkowski bf096aa716 visual improvements on farm scene
9 months ago
Katharina Ziolkowski 09ef508f49 Fixed field creation bug
9 months ago
Katharina Ziolkowski a54003c658 Made ground noise texture more seamless
9 months ago
Katharina Ziolkowski fbad33213c Finalized new watering can mechanic with vfx and ui
9 months ago