Commit Graph

256 Commits (76eb408a40e68d6912d714138d6bf6a239e4be82)

Author SHA1 Message Date
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
Katharina Ziolkowski 35c7e9a25e WIP Wasserstand UI
9 months ago
Katharina Ziolkowski 57896e37df Fixed background music loop and added audio mixers
9 months ago
Katharina Ziolkowski 242879159a Fixed sfx binding in farming scene
9 months ago
Katharina Ziolkowski 600d9cfca1 Made items activate directly when picked up
9 months ago
Katharina Ziolkowski 48796de1ba Changed dialogic background color to black and opacity to 168 sothat there is a visible dark overlay during dialogues
9 months ago
Katharina Ziolkowski 4a0b2cd550 Improved Inventory UI (more in the middle, adapt to viewport size, new selector image)
9 months ago
Katharina Ziolkowski ba429d7b84 wip improving inventory layout
9 months ago
Katharina Ziolkowski e33776daeb ESC closes inventory now.
9 months ago
Katharina Ziolkowski 9cfd3bd6f4 Improving farm outside scene performance
9 months ago
Katharina Ziolkowski c36d0b5866 reduced VRAM load by more than 50%
9 months ago
Katharina Ziolkowski 7467ec56d9 Fixed ordering issues in indoor scene
10 months ago
Katharina Ziolkowski 990494e8b0 Adjusted indoor speed
10 months ago
Katharina Ziolkowski c6e0cfe4d9 Fixed Button layout behaviour
10 months ago
Katharina Ziolkowski 4e010220bf Improved performance of the first indoor scene
10 months ago
Katharina Ziolkowski ccc4eb759e Added new house image to farming scene
10 months ago
Katharina Ziolkowski 0ebd0c46a0 Added indoor ending
10 months ago
Katharina Ziolkowski 2226b859df Added WateringCan SFX
10 months ago
Katharina Ziolkowski 07bcab4454 Added Farming SFX
10 months ago
Katharina Ziolkowski 4c6d5350b2 Added Background music
10 months ago
Katharina Ziolkowski 89ae347a91 Added last farming timelines and fixed some minor issues
10 months ago
Katharina Ziolkowski ddb5547b42 Updated Startscreen and added second tutorial step
10 months ago
Katharina Ziolkowski afa06d3ee2 Fixed Yeli Y sorting issue and made fields rounded
10 months ago
Katharina Ziolkowski dd656d5f5f Extended dialogic toggle
10 months ago
Katharina Ziolkowski b0f4592fdd Added first working timeline for yelis intro to farming scene
10 months ago
Katharina Ziolkowski 406c11b581 import statements
10 months ago
Katharina Ziolkowski b8e456f7ef moved player2D prefab
10 months ago
Katharina Ziolkowski 83e25f44cd Fixed background parallaxe effect in outdoor scene
10 months ago
Katharina Ziolkowski 31f19ad139 Code cleanup part 2
10 months ago
Katharina Ziolkowski c6ec99e87a Project cleanup: Removed 3D scripts and scenes from project. Also renamed and moved some minor stuff.
10 months ago
Katharina Ziolkowski 3e135afecb Added StartScreen and Scene Transition script
11 months ago
Katharina Ziolkowski a477f9ef4f Implemented field creation and wateringcan fill up animation
11 months ago
Katharina Ziolkowski 47a1326292 state after magic clip done
11 months ago
Katharina Ziolkowski 708aa8cca4 State after inventory clip (farming mechanic still WIP)
11 months ago
Katharina Ziolkowski 83f4144b43 Reworked farming tools pickup animations
11 months ago
Katharina Ziolkowski 2c677a8cda Inventory resource rework and slot aspect fix
11 months ago
cblech ec5d42068e fixed generic item on ground and added icon
11 months ago
Katharina Ziolkowski 60928c520c Inventory implemented
11 months ago
Katharina Ziolkowski 267172d026 WIP adding the inventory, also state after first clip
11 months ago
Katharina Ziolkowski 23ef4e9a63 changed visibility order for plants
11 months ago
Katharina Ziolkowski 73dc3063c0 removed unnecessary icons from farming controls
11 months ago
Katharina Ziolkowski 1094fb2142 Added tool animations to player
11 months ago
Katharina Ziolkowski ff426b0494 Initial Farming setup complete
11 months ago
Katharina Ziolkowski 90616537bc Watering fields
11 months ago
Katharina Ziolkowski 222c10fe0a limited field creation to specified shape
11 months ago
Katharina Ziolkowski 8af825bc18 InteractionAreas are now bound to SpriteSwitchers and farming tool interaction works
11 months ago
Katharina Ziolkowski 4afb02440c Reworking 2D interactions
11 months ago
Katharina Ziolkowski ff85b67087 Made interaction area 2d work - and farming/growing work again.
11 months ago
Katharina Ziolkowski 2a7f39e3fe Adjusted movement and included collider collisions as a constraint to the player
11 months ago
Katharina Ziolkowski 296fed6e08 Added fields
11 months ago
Katharina Ziolkowski 1af04631c5 Added 2d outdoor scene with parallaxe and mockup background
11 months ago
Katharina Ziolkowski 16a65f7155 added flat indoor test and skybox to 3d test
12 months ago
Katharina Ziolkowski 0fcc425ace built first 2d indoor scene + added kitchen
12 months ago
Katharina Ziolkowski 752cdb1502 Added new how sprite
12 months ago
Katharina Ziolkowski 8299998a0f Added fence to the left part of the farm
12 months ago
Katharina Ziolkowski 5ea6431216 Added tree prefabs and a forest border around the farm
12 months ago
Katharina Ziolkowski 339428c312 Basic watering functionality implemented
12 months ago
cblech 54b07cccad added autogenerated items
1 year ago
cblech fb362e10ad item count WIP
1 year ago
cblech e99b574d1f Added pickup error text
1 year ago
cblech 1062193785 item on ground and pickup
1 year ago
Katharina Ziolkowski c200098f0c WIP reworking the field behaviour to implement watering. Broken state.
1 year ago
Katharina Ziolkowski b5dcad5614 Vesna walking and idle animations work for all movement directions.
1 year ago
cblech 8c1822557c Added Inventory into babushka farming scene
1 year ago
cblech dacf48b9fd Merge remote-tracking branch 'origin/c_sharp_setup' into inventory
1 year ago
Katharina Ziolkowski bd4f7edc20 Creating new plantable fields works
1 year ago
Katharina Ziolkowski 45a58f701b Spawning fields works
1 year ago
Katharina Ziolkowski f08f3a7978 Fixed Pickup behaviour
1 year ago
Katharina Ziolkowski 26502f2d37 old style farming works again
1 year ago
Katharina Ziolkowski a9b1c179cd folder refactoring, plant_base adjustments
1 year ago
Katharina Ziolkowski 45d09cd618 Farming part I
1 year ago
Katharina Ziolkowski f2902ad7c1 added 2d and 3d house prototypes
1 year ago
Katharina Ziolkowski d4b7c0bf45 Translated some scripts from GDscript to C#
1 year ago
cblech 959ab68b4d Added basic inventory system
1 year ago
Katharina Ziolkowski 4f312209b3 a bit of restructuring, renaming, and c sharp setup
1 year ago
Katharina Ziolkowski e0b5a26ee6 created first c# setup
1 year ago
cblech 78471268db Show interaction popup (<E> Label)
1 year ago
cblech 84fcec8227 Added basic interaction functionality
1 year ago
cblech dc322d8943 Fixed camera
1 year ago
cblech 4ce0367f15 Added 3D Controller
1 year ago