Waldemar Tomme
|
64fcffb0f2
|
Bottles are now jokes
|
2024-01-28 11:51:33 +01:00 |
|
Waldemar Tomme
|
b345937708
|
Merge branch 'main' of git@192.168.8.1:tough_crowd into balancing
|
2024-01-28 11:07:55 +01:00 |
Mikhail Aristov
|
361464376a
|
move tables further apart
|
2024-01-28 10:41:39 +01:00 |
|
Waldemar Tomme
|
5347ef8dec
|
Merge branch 'main' of git@192.168.8.1:tough_crowd into balancing
|
2024-01-28 10:35:32 +01:00 |
|
Mikhail Aristov
|
36823f36c7
|
fix double joke
|
2024-01-28 10:34:06 +01:00 |
|
Waldemar Tomme
|
d92cbf66bf
|
Increase overall mood sensitivity/score
|
2024-01-28 10:30:18 +01:00 |
|
Waldemar Tomme
|
b5bc64a581
|
Audience actually hears joke now at the end
|
2024-01-28 10:02:41 +01:00 |
|
Mikhail Aristov
|
5b6a039132
|
+audience listening
+audience ignoring double jokes
|
2024-01-28 09:45:39 +01:00 |
|
Mikhail Aristov
|
2b07de2666
|
Merge remote-tracking branch 'remotes/origin/main' into feat_game_over
|
2024-01-27 21:18:42 +01:00 |
|
Mikhail Aristov
|
1f125ed467
|
endgame done
|
2024-01-27 21:10:50 +01:00 |
 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 |
|
Mikhail Aristov
|
762c9a945d
|
Merge remote-tracking branch 'remotes/origin/main' into feat_game_over
|
2024-01-27 20:35:17 +01:00 |
|
Mikhail Aristov
|
b91678f5b2
|
extract score overlay to prefab
|
2024-01-27 20:31:58 +01:00 |
|
Waldemar Tomme
|
677a7c518a
|
Add hook stub for empty stamina
|
2024-01-27 20:25:10 +01:00 |
|
Mikhail Aristov
|
84d2a3bbb0
|
+new assets
|
2024-01-27 17:59:29 +01:00 |
pytunia
|
16b43af80b
|
Adding tables and chairs.
|
2024-01-27 17:51:03 +01:00 |
|
Waldemar Tomme
|
5147614870
|
Adapt decay values
|
2024-01-27 17:15:24 +01:00 |
|
Waldemar Tomme
|
51546337ce
|
Merge remote-tracking branch 'origin/main' into joke-processing
|
2024-01-27 17:11:58 +01:00 |
|
Waldemar Tomme
|
3491b13cb5
|
Fix input mapping stuff etc.
|
2024-01-27 17:08:50 +01:00 |
|
Mikhail Aristov
|
d0412d2f01
|
patch bottles
|
2024-01-27 17:06:28 +01:00 |
|
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 |
|
Waldemar Tomme
|
473ed41338
|
Load profile data by color
|
2024-01-27 16:45:22 +01:00 |
|
Waldemar Tomme
|
c2192ffdb5
|
Merge remote-tracking branch 'origin/main' into joke-processing
|
2024-01-27 16:21:26 +01:00 |
|
Mikhail Aristov
|
50c859231e
|
fix sprite z index
|
2024-01-27 16:15:55 +01:00 |
|
Waldemar Tomme
|
ced61c6a45
|
Cleanup
|
2024-01-27 16:07:27 +01:00 |
|
Waldemar Tomme
|
5c45ce6f01
|
Merge main
|
2024-01-27 16:05:49 +01:00 |
|
Waldemar Tomme
|
7764ec3fd1
|
Add loadable profile data
|
2024-01-27 15:56:50 +01:00 |
|
Mikhail Aristov
|
50a636070f
|
fix mood cheat to trigger once per press
|
2024-01-27 15:51:52 +01:00 |
|
Marvin Dalheimer
|
bc8f933e22
|
throw bottles at Tim and hurt him
|
2024-01-27 15:50:20 +01:00 |
|
Mikhail Aristov
|
4df12455ab
|
+random bodies
|
2024-01-27 15:40:59 +01:00 |
|
Waldemar Tomme
|
4095d4df0f
|
Add mood mapping to profile
|
2024-01-27 15:20:18 +01:00 |
|
Mikhail Aristov
|
4d2762773e
|
+bodies
|
2024-01-27 14:08:40 +01:00 |
|
Mikhail Aristov
|
0c5a0ad84a
|
after merge fixes
|
2024-01-27 13:58:26 +01:00 |
root
|
7f18748659
|
Merge feat_new_mood into main
|
2024-01-27 13:54:28 +01:00 |
|
Mikhail Aristov
|
b466136258
|
+jenny
|
2024-01-27 13:36:08 +01:00 |
|
Mikhail Aristov
|
a0026213f8
|
+laughter
|
2024-01-27 13:30:02 +01:00 |
|
Waldemar Tomme
|
16afe2b983
|
Transmit jokes to the audience
|
2024-01-27 13:08:34 +01:00 |
|
Mikhail Aristov
|
6489729878
|
new mood logic
|
2024-01-27 12:02:06 +01:00 |
|
Mikhail Aristov
|
bdb583d206
|
prepare exports
|
2024-01-27 09:13:26 +01:00 |
|
Mikhail Aristov
|
5dcf2b35f8
|
+random faces
|
2024-01-26 22:10:03 +01:00 |
Marvin Dalheimer
|
0c74bbcc07
|
reorder tables
|
2024-01-26 21:06:59 +01:00 |
|
Marvin Dalheimer
|
8ca53a8939
|
add crowd sitting on tables
It is configurable how many people are spawned
|
2024-01-26 20:54:22 +01:00 |