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
..
bodies	+random bodies	2024-01-27 15:40:59 +01:00
boot	initial template commit	2024-01-26 19:01:32 +01:00
crowd	Merge branch 'main' into feature/tim_animation	2024-01-27 20:46:22 +01:00
faces	+jenny	2024-01-27 13:36:08 +01:00
objects	Add animations to Tim	2024-01-27 20:34:39 +01:00
Boundary.gd	+random faces	2024-01-26 22:10:03 +01:00
DisplayMood.gd	Merge branch 'main' into feature/tim_animation	2024-01-27 20:46:22 +01:00
DisplayStamina.gd	+stamina and mood display	2024-01-27 19:33:33 +01:00
Joke Button.gd	Add required joke stamina data	2024-01-27 19:58:18 +01:00
Tim.gd	Merge branch 'main' into feature/tim_animation	2024-01-27 20:46:22 +01:00
game_settings_scene.gd	initial template commit	2024-01-26 19:01:32 +01:00
game_settings_scene.tscn	initial template commit	2024-01-26 19:01:32 +01:00
ingame_scene.gd	Merge branch 'main' into feature/tim_animation	2024-01-27 20:46:22 +01:00
ingame_scene.tscn	Adding tables and chairs.	2024-01-27 17:51:03 +01:00
intro_scene.tscn	initial template commit	2024-01-26 19:01:32 +01:00
joke_button.tscn	Add required joke stamina data	2024-01-27 19:58:18 +01:00
main_menu_scene.gd	initial template commit	2024-01-26 19:01:32 +01:00
main_menu_scene.tscn	initial template commit	2024-01-26 19:01:32 +01:00
node_example.gd	initial template commit	2024-01-26 19:01:32 +01:00
signals.gd	Add animations to Tim	2024-01-27 20:34:39 +01:00
stage.tscn	Merge branch 'main' into feature/tim_animation	2024-01-27 20:46:22 +01:00