Commit Graph

243 Commits (67d5b67c21116b8112d1bb158d446f9446f8fbe5)

Author SHA1 Message Date
kziolkowski 5992c390ee Reinstated plantgrowing animation
5 months ago
kziolkowski 283caf282b Added interaction on mouse click
5 months ago
kziolkowski 7c03964d33 changed watering can display to slider
5 months ago
kziolkowski d0ba4076b3 planting, growing and watering a little less dependent than before
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 c2f5359d0c changes after develop merge
5 months ago
jonathan 06a270e916 Renamed function to not sound like a unity signal
5 months ago
jonathan b621df5435 removed invisible character
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 6aa7530502 Added speed hack for vesna
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 0008b16d48 Adjusted moving values and animations to make vesna not slide any more
5 months ago
kziolkowski 8e0dced918 Vesna can walk diagonally now
5 months ago
kziolkowski 18711776bb Fixed output error ERROR: Script class can only be set together with base class name
5 months ago
kziolkowski 0f246825fc Added Wellbehaviour and fixed door interaction to offer outlines
5 months ago
kziolkowski 730c4999d7 Extracted FightAttack Enum in the hopes of fixing errors
5 months ago
kziolkowski ad16b86171 wip exchanging interaction label with outline
6 months ago
kziolkowski 486cfb5546 WIP trying to fix the last plant stage bug on repeated farming rounds
6 months ago
kziolkowski b92eb909ad Removed no longer needed print statements
6 months ago
kziolkowski d2c7302ab2 Fixed farming (the way it was before)
6 months ago
kziolkowski a4f9511892 WIP fixing farming mechanic again
6 months ago
kziolkowski 7a3e96d679 Merge remote-tracking branch 'origin/feature/fight_system' into feature/showcase_kathi
6 months ago
cblech c0e002f783 made you win waiting time shorter
6 months ago
cblech e8850ca7c5 Added chuga dialog to fight scene
6 months ago
kziolkowski eaedf8c396 WIP Beetroot
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
kziolkowski 16251db248 WIP new SceneTransition system
6 months ago
cblech 4752002caf Added action per round
6 months ago
cblech 0e028a2cb9 Renamed signal
6 months ago
cblech 92c3f5e054 Target only alive enemies
6 months ago
cblech 6727339e9a Added audio to fight
6 months ago
cblech b6fd6292e3 Basic fighting system
6 months ago
kziolkowski 135ba0d198 Reworked Domovoi kitchen animation and added AnimationStarter script
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 9e97cc3b80 WIP duck pushing behaviour
6 months ago
kziolkowski ebc3ee9cf9 Implemented basic duck running away from vesna mechanic
6 months ago
kziolkowski 9c50a63dc3 Merge branch 'develop' into feature/showcase_kathi
6 months ago
cblech 32249fde86 Made quest visuals
6 months ago
cblech 27e137bc02 Made quest usable
6 months ago
cblech 01daddee3b Made basic quest setup
6 months ago
kziolkowski 2f5296e05a Diversified field shapes
6 months ago
kziolkowski 9c7ae20c18 Reworked Camera controls outside scene
6 months ago
kziolkowski ab2cf3f497 wateringcanstate uid?
6 months ago
kziolkowski bf096aa716 visual improvements on farm scene
6 months ago
kziolkowski 09ef508f49 Fixed field creation bug
6 months ago
kziolkowski fbad33213c Finalized new watering can mechanic with vfx and ui
6 months ago
kziolkowski 35c7e9a25e WIP Wasserstand UI
6 months ago
kziolkowski 57896e37df Fixed background music loop and added audio mixers
6 months ago
kziolkowski 600d9cfca1 Made items activate directly when picked up
6 months ago
kziolkowski 4a0b2cd550 Improved Inventory UI (more in the middle, adapt to viewport size, new selector image)
6 months ago
kziolkowski e33776daeb ESC closes inventory now.
6 months ago
kziolkowski bcdba7b812 Fixed Vesna sliding issue
6 months ago
kziolkowski 0ebd0c46a0 Added indoor ending
7 months ago
kziolkowski 2226b859df Added WateringCan SFX
7 months ago
kziolkowski 07bcab4454 Added Farming SFX
7 months ago
kziolkowski e269b3ab44 WIP trying to toggle interactable colliders at runtime for fields
7 months ago
kziolkowski 89ae347a91 Added last farming timelines and fixed some minor issues
7 months ago
kziolkowski dd656d5f5f Extended dialogic toggle
7 months ago
kziolkowski 9812006234 Added Yeli sprites and dialogic test timeline as well as prefab
7 months ago
kziolkowski 31f19ad139 Code cleanup part 2
7 months ago
kziolkowski c6ec99e87a Project cleanup: Removed 3D scripts and scenes from project. Also renamed and moved some minor stuff.
7 months ago
kziolkowski 1f17cca62d changes from build process
8 months ago
kziolkowski 3e135afecb Added StartScreen and Scene Transition script
8 months ago
kziolkowski 25d8f217ff basic harvesting implemented
8 months ago
kziolkowski a477f9ef4f Implemented field creation and wateringcan fill up animation
8 months ago
kziolkowski 47a1326292 state after magic clip done
8 months ago
kziolkowski 708aa8cca4 State after inventory clip (farming mechanic still WIP)
8 months ago
kziolkowski 83f4144b43 Reworked farming tools pickup animations
8 months ago
cblech ec5d42068e fixed generic item on ground and added icon
8 months ago
cblech 8fdb395ae8 Added icon to slot
8 months ago
kziolkowski 60928c520c Inventory implemented
8 months ago
kziolkowski f3ed5e0ad0 Changes to ItemOnGround
8 months ago
kziolkowski 917e6a5f7e Merge remote-tracking branch 'origin/inventory' into feature/farming_visuals
8 months ago
kziolkowski fa7cc66748 added farming animation mechanic
8 months ago
kziolkowski ad070514d7 Added item and interact animations
8 months ago
kziolkowski 80c48ea3df added pickup animation
8 months ago
cblech d76218f88f Moved Bar slot selection handling to inventory manager
8 months ago
kziolkowski 7276bdda38 Watering can animation plays when watering
8 months ago
kziolkowski 73dc3063c0 removed unnecessary icons from farming controls
8 months ago
cblech 9a5caef52f Added inventory background and fixes
8 months ago
kziolkowski 1094fb2142 Added tool animations to player
8 months ago
cblech 2ab1c38de9 cleaned Inventory ui
8 months ago
kziolkowski ff426b0494 Initial Farming setup complete
8 months ago
kziolkowski 90616537bc Watering fields
8 months ago
kziolkowski 0f8eb244e9 planting / growth works again
8 months ago
kziolkowski 38fdad7690 removed print statements
8 months ago
kziolkowski 0de6bc0c04 the most beautiful grid of fields you can imagine
8 months ago
kziolkowski 222c10fe0a limited field creation to specified shape
8 months ago
kziolkowski 8af825bc18 InteractionAreas are now bound to SpriteSwitchers and farming tool interaction works
8 months ago
kziolkowski 77c0babdca minor changes after merge
8 months ago
kziolkowski 4afb02440c Reworking 2D interactions
8 months ago
kziolkowski ff85b67087 Made interaction area 2d work - and farming/growing work again.
8 months ago
kziolkowski 366923699c WIP 2D rework
8 months ago
kziolkowski 2a7f39e3fe Adjusted movement and included collider collisions as a constraint to the player
8 months ago
kziolkowski d11fc9f1f2 Cleaned up house mockup outline and removed spammy debug log
9 months ago
kziolkowski 0fcc425ace built first 2d indoor scene + added kitchen
9 months ago
kziolkowski 762a694be3 Spawning and watering is now bound to the cursor position (kinda)
9 months ago
kziolkowski 339428c312 Basic watering functionality implemented
9 months ago
kziolkowski 7e19268847 Merge remote-tracking branch 'origin/main' into c_sharp_setup
9 months ago
kziolkowski 20b37de108 generated files
9 months ago
cblech 54b07cccad added autogenerated items
9 months ago
cblech fb0c14c3f1 Added item stacking
9 months ago
cblech fb362e10ad item count WIP
9 months ago
kziolkowski c73d3ff370 Reworked the fieldservice
9 months ago
cblech e99b574d1f Added pickup error text
9 months ago
cblech 1062193785 item on ground and pickup
9 months ago
kziolkowski c200098f0c WIP reworking the field behaviour to implement watering. Broken state.
9 months ago
kziolkowski 5db71adf03 Fields spawn on a grid
9 months ago
kziolkowski ce5d2b65d3 Separated farming controls from vesna behvaiour and adjusted the setup
9 months ago
kziolkowski 6016f1cf38 Removed Debug.Log
9 months ago
kziolkowski b5dcad5614 Vesna walking and idle animations work for all movement directions.
9 months ago
cblech dacf48b9fd Merge remote-tracking branch 'origin/c_sharp_setup' into inventory
9 months ago
cblech daa53e4aef Added slot select
9 months ago
cblech 667ef6fb9b Added open close inventory
9 months ago
cblech c90687939c Move items
9 months ago
kziolkowski 8622f2d38d Added vesna animations
9 months ago
kziolkowski bd4f7edc20 Creating new plantable fields works
9 months ago
kziolkowski 45a58f701b Spawning fields works
9 months ago
kziolkowski f08f3a7978 Fixed Pickup behaviour
9 months ago
kziolkowski a9b1c179cd folder refactoring, plant_base adjustments
9 months ago
kziolkowski d144f5c0c4 Added Sprite Swap and Horizontal flipping to character controller
9 months ago
kziolkowski 45d09cd618 Farming part I
9 months ago
kziolkowski 7f8b444270 Translated Player Scripts from GDScript to C#
10 months ago
kziolkowski d4b7c0bf45 Translated some scripts from GDscript to C#
10 months ago
cblech 959ab68b4d Added basic inventory system
10 months ago
kziolkowski 4f312209b3 a bit of restructuring, renaming, and c sharp setup
10 months ago
kziolkowski e0b5a26ee6 created first c# setup
10 months ago
cblech 78471268db Show interaction popup (<E> Label)
1 year ago
cblech 84fcec8227 Added basic interaction functionality
1 year ago
cblech 4ce0367f15 Added 3D Controller
1 year ago
cblech 5ea5e5547c Added basic dialogic translation
1 year ago
cblech d231bb0773 Added Dialogic and a test dialog
1 year ago
cblech ea20332b4f Made very basic graphics test scene
1 year ago