Commit Graph

2 Commits

Author SHA1 Message Date
Marvin Dalheimer fe5436c9ab Merge branch 'main' into feature/tim_animation
# Conflicts:
#	godot/scenes/Tim.gd
#	godot/scenes/stage.tscn
2024-01-27 20:46:22 +01:00
Mikhail Aristov fa47248174 +stamina and mood display 2024-01-27 19:33:33 +01:00