Commit Graph

178 Commits (fd0e631b1f5fadccafc3374f09717cc210327870)

Author SHA1 Message Date
jonathan fd0e631b1f Bootstrap fight system
2 months ago
kziolkowski af8807610d :bug increased interaction area size for fence gates
2 months ago
kziolkowski 02b6584e44 🐛 fixed ObjectDisposedException from the Inventory when switching scenes.
2 months ago
kziolkowski e202534c6b 🐛 Vesnas Namensschild sieht nicht richtig aus FIXED
2 months ago
kziolkowski 1f13f3ea51 Merge branch 'develop' into feature/detection_cross
2 months ago
kziolkowski 3fe79f2fd8 Added VariableGetter functionality and some Variable setting components. Also added them to test scene.
3 months ago
kziolkowski c96e6da78e Separated events from variables and adjusted test scene
3 months ago
kziolkowski e1b1a2f447 🔧 adjusted seed pickup positions and indoor collider sizes
3 months ago
kziolkowski 2d4e853ec8 🍱 Adjusted colliders in farm_outside scene and reactivated ground collider on Vesna
3 months ago
kziolkowski ffebe10593 💄 Added new fonts and increased textbox size. Also added border line.
3 months ago
kziolkowski 5bcbee8865 created test scene and removed event test elements from start scene
3 months ago
kziolkowski a593be8273 📝 added documentation and improved event scope
3 months ago
kziolkowski 1e004b62b8 Implemented first version of EventResources
3 months ago
kziolkowski 5fc7b3d563 scene updates after undoing changes to interactionArea
3 months ago
kziolkowski 936983e14f 💄 updated dialogic style to make it clearer who is talking and have vesna always on the left side
4 months ago
kziolkowski e73f13d7d4 🎨 💄 Created art template for farm plants and reworked existing plant prefabs and inventory resources
4 months ago
kziolkowski 0713e334b3 Fixed InventoryInstance behaviour
4 months ago
kziolkowski c56f654751 Set up second garden with beetroot, built transition from yard and back
4 months ago
kziolkowski 1f88f9b4b5 Added beetroot as growable plant
4 months ago
kziolkowski 06fd80f762 grass layering fix
4 months ago
kziolkowski 2cb605261e Fixed Tomato farming (again)
4 months ago
kziolkowski d1a8ff0cbf WIP reworking the item repository
4 months ago
kziolkowski e44e06bace Added Footsteps SFX
5 months ago
kziolkowski 871e1856f1 Tools get deactivated from animation when switching to an empty slot in the inventory. Also fixed layering (AGAIN)
5 months ago
kziolkowski 378bf45c49 Implemented PR feedback + made sure initial farming quests run smoothly
5 months ago
kziolkowski f6e0c4e615 minor scene fixes
5 months ago
kziolkowski 6ae877f2ab Implemented first version of an interactable area that reacts to inventory selection
5 months ago
kziolkowski 7fd26ffed3 Fixed tomato farming again
5 months ago
kziolkowski ce2d7eb773 WIP moving seed to plant matching into separate system, making fields independent of specific plants.
5 months ago
kziolkowski 96c7d35aa7 Added word wrapping to quest post it.
5 months ago
kziolkowski c2f5359d0c changes after develop merge
5 months ago
jonathan 06a270e916 Renamed function to not sound like a unity signal
5 months ago
jonathan 03dbc08293 quest status name refactoring
5 months ago
jonathan 6e998810b6 Completed first demo quest line
5 months ago
jonathan c96be7467e Added Quest field
5 months ago
Jonathan d7ac1c6c22 Fixed retrigger yeli dialog
5 months ago
Jonathan 0170a53b5a Added more quest stuff including dialogic quest condition
5 months ago
cblech abc33fd06c Added first quests
5 months ago
kziolkowski b69191e7f7 fixed pickup layering
5 months ago
kziolkowski 8f75b5b644 Added secondary outline mat and assigned it to inventory items
5 months ago
kziolkowski e88ba2e1ef Updated interaction area setups to avoid nullrefs
5 months ago
kziolkowski f01143e887 cleaned up dialogue structure and removed vesna2 from dialogues
5 months ago
kziolkowski 0f246825fc Added Wellbehaviour and fixed door interaction to offer outlines
5 months ago
kziolkowski 19e30dd0b8 Removed disclaimer reference from bootstrap
5 months ago
kziolkowski ad16b86171 wip exchanging interaction label with outline
6 months ago
kziolkowski 5ee295256b Fixed Yeli Layering issue in indoor scene
6 months ago
kziolkowski ab23d41496 Fixed ysorting on ducks and trash
6 months ago
kziolkowski d2c7302ab2 Fixed farming (the way it was before)
6 months ago
kziolkowski 5affc48dc5 Added scene transitions between fighting scene, credits, and start
6 months ago
kziolkowski cdb6b83124 Merge remote-tracking branch 'origin/feature/fight_system' into feature/showcase_kathi
6 months ago