Commit Graph

12 Commits

Author SHA1 Message Date
Waldemar Tomme a76cd29124 Disable joke buttons while talking and at game end 2024-01-28 09:16:46 +01:00
Mikhail Aristov 2b07de2666 Merge remote-tracking branch 'remotes/origin/main' into feat_game_over 2024-01-27 21:18:42 +01:00
Mikhail Aristov 1f125ed467 endgame done 2024-01-27 21:10:50 +01:00
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
Marvin Dalheimer 2c7128aafd Add animations to Tim 2024-01-27 20:34:39 +01:00
Waldemar Tomme 677a7c518a Add hook stub for empty stamina 2024-01-27 20:25:10 +01:00
Mikhail Aristov fa47248174 +stamina and mood display 2024-01-27 19:33:33 +01:00
Mikhail Aristov 0c5a0ad84a after merge fixes 2024-01-27 13:58:26 +01:00
Waldemar Tomme 16afe2b983 Transmit jokes to the audience 2024-01-27 13:08:34 +01:00
Waldemar Tomme f224391f30 Implement joke button signaling 2024-01-27 12:36:06 +01:00
Mikhail Aristov e9213d5ecc post-merge fixes 2024-01-26 21:22:33 +01:00
Waldemar Tomme 41730b86dd Tim can move now 2024-01-26 21:01:22 +01:00