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
..
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 'feature/bottle_throwing'	2024-01-27 16:50:22 +01:00
faces	+jenny	2024-01-27 13:36:08 +01:00
objects	throw bottles at Tim and hurt him	2024-01-27 15:50:20 +01:00
Boundary.gd	+random faces	2024-01-26 22:10:03 +01:00
Joke Button.gd	Set sprites based on jokes	2024-01-27 13:35:14 +01:00
Tim.gd	Merge branch 'feature/bottle_throwing'	2024-01-27 16:50: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	initial template commit	2024-01-26 19:01:32 +01:00
ingame_scene.tscn	post-merge fixes	2024-01-26 21:22:33 +01:00
intro_scene.tscn	initial template commit	2024-01-26 19:01:32 +01:00
joke_button.tscn	patch references	2024-01-27 16:35:53 +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
stage.tscn	fix sprite z index	2024-01-27 16:15:55 +01:00