Marvin Dalheimer 7021cf6634 Merge branch 'feature/bottle_throwing' ... # Conflicts: # godot/scenes/Tim.gd # godot/scenes/crowd/person.gd # godot/scenes/crowd/person.tscn # godot/scenes/stage.tscn		2024-01-27 16:50: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 'feature/bottle_throwing'	2024-01-27 16:50:22 +01:00
settings	initial template commit	2024-01-26 19:01:32 +01:00
sprites	Merge remote-tracking branch 'origin/main' into art	2024-01-27 15:43:22 +01:00
types	Set sprites based on jokes	2024-01-27 13:35:14 +01:00
ui	after merge fixes	2024-01-27 13:58:26 +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 joke buttons	2024-01-27 11:38:38 +01:00