Mikhail Aristov
|
8ade594449
|
sync indents
|
2024-01-27 16:56:14 +01:00 |
 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 |
|
Marvin Dalheimer
|
bc8f933e22
|
throw bottles at Tim and hurt him
|
2024-01-27 15:50:20 +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 |