 Katharina Ziolkowski
|
917e6a5f7e
|
Merge remote-tracking branch 'origin/inventory' into feature/farming_visuals
# Conflicts:
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0001.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0002.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0003.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0004.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0005.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0006.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0007.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0008.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0009.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0010.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0011.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0012.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0013.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0014.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0015.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0016.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0017.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0018.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0019.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0020.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0001.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0002.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0003.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0004.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0005.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0006.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0007.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0008.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0009.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0010.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0011.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0012.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0013.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0014.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0015.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0016.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0017.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0018.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0019.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0020.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0001.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0002.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0003.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0004.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0005.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0006.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0007.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0008.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0009.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0010.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0011.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0012.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0013.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0014.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0015.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0016.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0017.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0018.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0019.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0020.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0001.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0002.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0003.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0004.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0005.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0006.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0007.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0008.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0009.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0010.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0011.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0012.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0013.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0014.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0015.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0016.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0017.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0018.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0019.png.import
# art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0020.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0001.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0002.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0003.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0004.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0005.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0006.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0007.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0008.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0009.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0010.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0011.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0012.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0013.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0014.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0015.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0016.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0017.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0018.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0019.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0020.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0001.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0002.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0003.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0004.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0005.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0006.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0007.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0008.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0009.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0010.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0011.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0012.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0013.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0014.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0015.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0016.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0017.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0018.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0019.png.import
# art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0020.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0001.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0002.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0003.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0004.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0005.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0006.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0007.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0008.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0009.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0010.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0011.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0012.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0013.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0014.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0015.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0016.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0017.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0018.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0019.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0020.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0001.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0002.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0003.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0004.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0005.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0006.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0007.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0008.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0009.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0010.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0011.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0012.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0013.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0014.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0015.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0016.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0017.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0018.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0019.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0020.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0001.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0002.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0003.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0004.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0005.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0006.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0007.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0008.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0009.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0010.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0011.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0012.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0013.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0014.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0015.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0016.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0017.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0018.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0019.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0020.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0001.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0002.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0003.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0004.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0005.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0006.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0007.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0008.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0009.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0010.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0011.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0012.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0013.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0014.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0015.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0016.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0017.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0018.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0019.png.import
# art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0020.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0001.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0002.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0003.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0004.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0005.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0006.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0007.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0008.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0009.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0010.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0011.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0012.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0013.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0014.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0015.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0016.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0017.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0018.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0019.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0020.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0001.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0002.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0003.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0004.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0005.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0006.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0007.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0008.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0009.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0010.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0011.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0012.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0013.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0014.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0015.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0016.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0017.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0018.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0019.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0020.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0001.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0002.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0003.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0004.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0005.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0006.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0007.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0008.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0009.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0010.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0011.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0012.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0013.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0014.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0015.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0016.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0017.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0018.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0019.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0020.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0001.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0002.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0003.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0004.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0005.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0006.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0007.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0008.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0009.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0010.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0011.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0012.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0013.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0014.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0015.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0016.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0017.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0018.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0019.png.import
# art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0020.png.import
# prefabs/UI/Inventory/Inventory.tscn
# scenes/Babushka_scene_farm_outside_2d.tscn
|
12 months ago |
|
Katharina Ziolkowski
|
fa7cc66748
|
added farming animation mechanic
|
1 year ago |
|
Katharina Ziolkowski
|
ad070514d7
|
Added item and interact animations
|
1 year ago |
|
Katharina Ziolkowski
|
80c48ea3df
|
added pickup animation
|
1 year ago |
cblech
|
d76218f88f
|
Moved Bar slot selection handling to inventory manager
|
1 year ago |
|
Katharina Ziolkowski
|
7276bdda38
|
Watering can animation plays when watering
|
1 year ago |
|
Katharina Ziolkowski
|
73dc3063c0
|
removed unnecessary icons from farming controls
|
1 year ago |
|
cblech
|
9a5caef52f
|
Added inventory background and fixes
|
1 year ago |
|
Katharina Ziolkowski
|
1094fb2142
|
Added tool animations to player
|
1 year ago |
|
cblech
|
2ab1c38de9
|
cleaned Inventory ui
|
1 year ago |
|
Katharina Ziolkowski
|
ff426b0494
|
Initial Farming setup complete
|
1 year ago |
|
Katharina Ziolkowski
|
90616537bc
|
Watering fields
|
1 year ago |
|
Katharina Ziolkowski
|
0f8eb244e9
|
planting / growth works again
|
1 year ago |
|
Katharina Ziolkowski
|
38fdad7690
|
removed print statements
|
1 year ago |
|
Katharina Ziolkowski
|
0de6bc0c04
|
the most beautiful grid of fields you can imagine
|
1 year ago |
|
Katharina Ziolkowski
|
222c10fe0a
|
limited field creation to specified shape
|
1 year ago |
|
Katharina Ziolkowski
|
8af825bc18
|
InteractionAreas are now bound to SpriteSwitchers and farming tool interaction works
|
1 year ago |
|
Katharina Ziolkowski
|
77c0babdca
|
minor changes after merge
|
1 year ago |
|
Katharina Ziolkowski
|
4afb02440c
|
Reworking 2D interactions
|
1 year ago |
|
Katharina Ziolkowski
|
ff85b67087
|
Made interaction area 2d work - and farming/growing work again.
|
1 year ago |
|
Katharina Ziolkowski
|
366923699c
|
WIP 2D rework
|
1 year ago |
|
Katharina Ziolkowski
|
2a7f39e3fe
|
Adjusted movement and included collider collisions as a constraint to the player
|
1 year ago |
|
Katharina Ziolkowski
|
d11fc9f1f2
|
Cleaned up house mockup outline and removed spammy debug log
|
1 year ago |
|
Katharina Ziolkowski
|
0fcc425ace
|
built first 2d indoor scene + added kitchen
|
1 year ago |
|
Katharina Ziolkowski
|
762a694be3
|
Spawning and watering is now bound to the cursor position (kinda)
|
1 year ago |
|
Katharina Ziolkowski
|
339428c312
|
Basic watering functionality implemented
|
1 year ago |
|
Katharina Ziolkowski
|
7e19268847
|
Merge remote-tracking branch 'origin/main' into c_sharp_setup
# Conflicts:
# scripts/CSharp/Common/CharacterControls/VesnaBehaviour.cs.uid
# scripts/CSharp/Common/Farming/FieldService.cs.uid
|
1 year ago |
|
Katharina Ziolkowski
|
20b37de108
|
generated files
|
1 year ago |
cblech
|
54b07cccad
|
added autogenerated items
|
1 year ago |
|
cblech
|
fb0c14c3f1
|
Added item stacking
|
1 year ago |
|
cblech
|
fb362e10ad
|
item count WIP
|
1 year ago |
|
Katharina Ziolkowski
|
c73d3ff370
|
Reworked the fieldservice
|
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
|
5db71adf03
|
Fields spawn on a grid
|
1 year ago |
|
Katharina Ziolkowski
|
ce5d2b65d3
|
Separated farming controls from vesna behvaiour and adjusted the setup
|
1 year ago |
|
Katharina Ziolkowski
|
6016f1cf38
|
Removed Debug.Log
|
1 year ago |
|
Katharina Ziolkowski
|
b5dcad5614
|
Vesna walking and idle animations work for all movement directions.
|
1 year ago |
|
cblech
|
dacf48b9fd
|
Merge remote-tracking branch 'origin/c_sharp_setup' into inventory
|
1 year ago |
|
cblech
|
daa53e4aef
|
Added slot select
|
1 year ago |
|
cblech
|
667ef6fb9b
|
Added open close inventory
|
1 year ago |
|
cblech
|
c90687939c
|
Move items
|
1 year ago |
|
Katharina Ziolkowski
|
8622f2d38d
|
Added vesna animations
|
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
|
a9b1c179cd
|
folder refactoring, plant_base adjustments
|
1 year ago |
|
Katharina Ziolkowski
|
d144f5c0c4
|
Added Sprite Swap and Horizontal flipping to character controller
|
1 year ago |
|
Katharina Ziolkowski
|
45d09cd618
|
Farming part I
|
1 year ago |
