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
..
fonts	initial template commit	2024-01-26 19:01:32 +01:00
i18n	+jenny	2024-01-27 13:36:08 +01:00
music	initial template commit	2024-01-26 19:01:32 +01:00
savegame	initial template commit	2024-01-26 19:01:32 +01:00
scenes	Merge branch 'main' into feature/tim_animation	2024-01-27 20:46:22 +01:00
settings	initial template commit	2024-01-26 19:01:32 +01:00
sprites	Walking and talking.	2024-01-27 19:34:08 +01:00
types	Add required joke stamina data	2024-01-27 19:58:18 +01:00
ui	+stamina and mood display	2024-01-27 19:33:33 +01:00
default_bus_layout.tres	initial template commit	2024-01-26 19:01:32 +01:00
export_presets.cfg	prepare exports	2024-01-27 09:13:26 +01:00
icon.svg	initial template commit	2024-01-26 19:01:32 +01:00
icon.svg.import	initial template commit	2024-01-26 19:01:32 +01:00
project.godot	Add animations to Tim	2024-01-27 20:34:39 +01:00