Commit Graph

92 Commits (Enemy_selection_overlap)

Author SHA1 Message Date
Katharina Ziolkowski e51e0a24d2 🐛 fixed dialogic bugs and moved trash items out of the way
4 months ago
Jonathan b205e45096 Merge pull request 'feature/farming_bugfixes_and_magic_word' (#30) from feature/farming_bugfixes_and_magic_word into develop
5 months ago
Katharina Ziolkowski c02a2d1383 Import changes lol
5 months ago
Katharina Ziolkowski c52bfc8017 🐛 fixed field outline
5 months ago
Katharina Ziolkowski 0fc1760b70 Merge pull request 'feature/animations_update' (#17) from feature/animations_update into develop
6 months ago
Katharina Ziolkowski 09b2baab0a Merge remote-tracking branch 'origin/Animations' into feature/animations_update
6 months ago
Katharina Ziolkowski e73f13d7d4 🎨 💄 Created art template for farm plants and reworked existing plant prefabs and inventory resources
7 months ago
Katharina Ziolkowski 1f88f9b4b5 Added beetroot as growable plant
7 months ago
Felix Paul da7cd2f6f2 Small update
7 months ago
Katharina Ziolkowski 8f75b5b644 Added secondary outline mat and assigned it to inventory items
8 months ago
Katharina Ziolkowski 0f246825fc Added Wellbehaviour and fixed door interaction to offer outlines
9 months ago
Katharina Ziolkowski ad16b86171 wip exchanging interaction label with outline
9 months ago
Felix Paul 12842a37ff Rigged Chuga
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
cblech e8850ca7c5 Added chuga dialog to fight scene
9 months ago
Katharina Ziolkowski eaedf8c396 WIP Beetroot
9 months ago
cblech 11790434f5 Merge remote-tracking branch 'origin/feature/showcase_kathi' into feature/fight_system
9 months ago
cblech 8bd2b09232 Added healing
9 months ago
cblech c6fc400994 Added second fight with mavkha
9 months ago
cblech 6727339e9a Added audio to fight
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 28bb81c0b0 Added fence gates and fixed dialogic toggle for inventory
9 months ago
Katharina Ziolkowski 8c18688a69 MVP duck setup
9 months ago
Katharina Ziolkowski 9c50a63dc3 Merge branch 'develop' into feature/showcase_kathi
9 months ago
cblech 32249fde86 Made quest visuals
9 months ago
Katharina Ziolkowski 9acea54f28 Added duck sprite
9 months ago
Katharina Ziolkowski 2f5296e05a Diversified field shapes
9 months ago
Katharina Ziolkowski e8a58655ad Added grass textures and field borders
9 months ago
Felix Paul ffc7ef2d61 Added Vesna and Yeli as 2D rigged chars, Chuga is still WIP
9 months ago
Katharina Ziolkowski bf096aa716 visual improvements on farm scene
9 months ago
Katharina Ziolkowski 35c7e9a25e WIP Wasserstand UI
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 9cfd3bd6f4 Improving farm outside scene performance
9 months ago
Katharina Ziolkowski c36d0b5866 reduced VRAM load by more than 50%
9 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 83c8a15e5a Added art for updated startscreen to project (but not yet to start menu scene)
10 months ago
Katharina Ziolkowski afa06d3ee2 Fixed Yeli Y sorting issue and made fields rounded
10 months ago
Katharina Ziolkowski 406c11b581 import statements
10 months ago
Katharina Ziolkowski 9812006234 Added Yeli sprites and dialogic test timeline as well as prefab
10 months ago
Felix Paul 97e5485ef1 Added Yeli Idle and Talk animations
10 months ago
Felix Paul c77563d38e Rerender Harvesting and added Watering animations
10 months ago
Katharina Ziolkowski 523624756e missing import files
10 months ago
Katharina Ziolkowski d7dfd03241 Deleted unused material folder
10 months ago
Anna Scheck 90cadbea07 ui elemente hinzugefügt für dialog
10 months ago