Commit Graph

246 Commits (f1a2e6166bee1646877ebdac62c8ea8b5f348c3a)

Author SHA1 Message Date
kziolkowski 554a319428 🚧 farming rework part 2: you can now kinda "create" fields
2 months ago
kziolkowski b00b466045 🚧 watering fields kinda works now
2 months ago
kziolkowski d51cc461f7 🚧 made preplaced fields show plants
2 months ago
kziolkowski 55f0d2a77e 🚧 reworked farming system to work with indices instead of positions
2 months ago
jonathan 1531ffbf8d Sleeping in bed now loads the new fight world scene
2 months ago
kziolkowski 97dcadf07a Added sceneprovider reference to field scripts and made them register on ready. Also added VariableSetter.
2 months ago
jonathan c814d7606d 🐛Fixed wrong dependency
2 months ago
kziolkowski 6a2355cf97 🐛 fixed never more than 10 fields bug
2 months ago
kziolkowski f1b980cdb6 🐛 field creation at the same spot no longer possible, also watering works now.
2 months ago
kziolkowski 8b77ca9bc5 ♻️ migrated the InteractionAreas currently used to the new format and removed the old code
2 months ago
jonathan 0de3bcae22 ♻️Code cleanup
2 months ago
jonathan 3326bde40c 🐛Exiting fight happening when one side wins
2 months ago
jonathan 8bb1c22549 Added minigame to attack action
2 months ago
jonathan 8624e2aea8 Added minigame
2 months ago
jonathan f4d8ed87e2 Added blob attack action
2 months ago
jonathan 9bf25640f6 Added basic action animation
2 months ago
jonathan 0e315396c9 Made fight fightable
2 months ago
jonathan f27dd199b8 Fight happening base setup
2 months ago
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
3 months ago
kziolkowski 1f13f3ea51 Merge branch 'develop' into feature/detection_cross
3 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
kziolkowski a4f9511892 WIP fixing farming mechanic again
6 months ago
cblech cc7e8c5c4b Added Credits
6 months ago
kziolkowski 7a3e96d679 Merge remote-tracking branch 'origin/feature/fight_system' into feature/showcase_kathi
6 months ago
kziolkowski e38c391e1c Reworked flow to make it playable somehow
6 months ago
cblech e8850ca7c5 Added chuga dialog to fight scene
6 months ago
kziolkowski eaedf8c396 WIP Beetroot
6 months ago
kziolkowski ffa20bbdf8 Added trash to first outdoor scene
6 months ago
kziolkowski b77b6e3a52 Added second outdoor scene after tutorial
6 months ago
cblech 11790434f5 Merge remote-tracking branch 'origin/feature/showcase_kathi' into feature/fight_system
6 months ago
kziolkowski c7d56301fc Added counter script to count ducks (and other things)
6 months ago
cblech 8bd2b09232 Added healing
6 months ago
kziolkowski 480d149ede SceneTransition Rework completed
6 months ago
cblech c6fc400994 Added second fight with mavkha
6 months ago
kziolkowski 16251db248 WIP new SceneTransition system
6 months ago
cblech 01a281c2aa Fixed camera bounds
6 months ago
cblech 2a46d363e9 Changed music to forrest
6 months ago
cblech b6fd6292e3 Basic fighting system
6 months ago
kziolkowski e8c24e18be Added indoor bedroom scene
6 months ago
kziolkowski 199d0873c8 Set up beetroot quest and added cat to indoor scene.
6 months ago
kziolkowski 135ba0d198 Reworked Domovoi kitchen animation and added AnimationStarter script
6 months ago
kziolkowski 28bb81c0b0 Added fence gates and fixed dialogic toggle for inventory
6 months ago
kziolkowski b9c5de6dc3 Made labels visible on ducks
6 months ago
kziolkowski 8c18688a69 MVP duck setup
6 months ago
kziolkowski 2429958741 Added Disclaimer scene
6 months ago
kziolkowski 6b5a8ee126 WIP duck behaviour
6 months ago
kziolkowski 8d40529349 Changed StartScreen layout and added Quit button
6 months ago
kziolkowski 9e97cc3b80 WIP duck pushing behaviour
6 months ago
kziolkowski ebc3ee9cf9 Implemented basic duck running away from vesna mechanic
6 months ago
kziolkowski 55d6222698 Added Camera to Indoor Common Room scene and renamend scene asset
6 months ago
kziolkowski d7ad2ba072 reverted / recreated inventory changes
6 months ago
kziolkowski 9c50a63dc3 Merge branch 'develop' into feature/showcase_kathi
6 months ago
cblech 32249fde86 Made quest visuals
6 months ago