Commit Graph

402 Commits (feature/integrate_new_fight)
 

Author SHA1 Message Date
Katharina Ziolkowski 7c03964d33 changed watering can display to slider
8 months ago
Katharina Ziolkowski 36c948f116 re-added watering animation and vfx
8 months ago
Katharina Ziolkowski d0ba4076b3 planting, growing and watering a little less dependent than before
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 41365fb5d4 Fixed tool animation
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 9bebe1a44d Merge pull request 'Implemented first demo quest line' (#15) from feature/implement_quests into develop
8 months ago
jonathan 06a270e916 Renamed function to not sound like a unity signal
8 months ago
jonathan b621df5435 removed invisible character
8 months ago
jonathan 03dbc08293 quest status name refactoring
8 months ago
jonathan 8676bbb2f6 Fix spelling
8 months ago
jonathan 6e998810b6 Completed first demo quest line
8 months ago
jonathan c96be7467e Added Quest field
8 months ago
Jonathan 6aa7530502 Added speed hack for vesna
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
cblech 2fbeb93018 Dialogic quest addition and plugin fix
8 months ago
Jonathan 9253a78a06 Merge pull request 'feature/showcase_bugfixing_kathi' (#14) from feature/showcase_bugfixing_kathi into develop
8 months ago
Katharina Ziolkowski 0008b16d48 Adjusted moving values and animations to make vesna not slide any more
8 months ago
Katharina Ziolkowski 8e0dced918 Vesna can walk diagonally now
8 months ago
Katharina Ziolkowski 2e21fb7e98 Made sure splash screen features logo
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 6275bea52c MAde Vesna and Yeli disappear on dialogic start
8 months ago
Katharina Ziolkowski 279cac22ee Fixed dialogic settings
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 18711776bb Fixed output error ERROR: Script class can only be set together with base class name
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 730c4999d7 Extracted FightAttack Enum in the hopes of fixing errors
9 months ago
Katharina Ziolkowski cfe604d3b7 set duck body scale to 1,1
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
Felix Paul 12842a37ff Rigged Chuga
9 months ago
Jonathan ae0944fe00 Merge pull request 'feature/showcase_kathi' (#12) from feature/showcase_kathi into develop
9 months ago
Katharina Ziolkowski 486cfb5546 WIP trying to fix the last plant stage bug on repeated farming rounds
9 months ago
Katharina Ziolkowski b92eb909ad Removed no longer needed print statements
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 c0e002f783 made you win waiting time shorter
9 months ago