 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
|
af5dcaaa6b
|
Merge remote-tracking branch 'origin/main' into joke-processing
|
2024-01-27 16:48:23 +01:00 |
|
Waldemar Tomme
|
473ed41338
|
Load profile data by color
|
2024-01-27 16:45:22 +01:00 |
Mikhail Aristov
|
53169cdb33
|
patch references
|
2024-01-27 16:35:53 +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
|
d60617224e
|
Merge remote-tracking branch 'origin/main' into joke-processing
|
2024-01-27 15:58:24 +01:00 |
|
Waldemar Tomme
|
7764ec3fd1
|
Add loadable profile data
|
2024-01-27 15:56:50 +01:00 |
|
Mikhail Aristov
|
84ee0d84d2
|
Merge branch 'feat_bodies'
|
2024-01-27 15:52:46 +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 |
pytunia
|
2392689db9
|
Merge remote-tracking branch 'origin/main' into art
|
2024-01-27 15:43:22 +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 |
|
pytunia
|
1ce4e6f210
|
Fixed Jennys hair and weird artefacts in body sprites.
|
2024-01-27 15:17:16 +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 |
|
Waldemar Tomme
|
6220fbdbf9
|
Set sprites based on jokes
|
2024-01-27 13:35:14 +01:00 |
|
Mikhail Aristov
|
9e97fe36cb
|
Merge remote-tracking branch 'remotes/origin/art' into feat_new_mood
|
2024-01-27 13:31:00 +01:00 |
|
Mikhail Aristov
|
a0026213f8
|
+laughter
|
2024-01-27 13:30:02 +01:00 |
|
pytunia
|
4faa6ae915
|
Tim ducking.
|
2024-01-27 13:21:31 +01:00 |
|
Waldemar Tomme
|
9edf0e85b6
|
Use instantiated joke buttons
|
2024-01-27 13:17:56 +01:00 |
|
Waldemar Tomme
|
f137b43531
|
Merge remote-tracking branch 'origin/art' into joke-signaling
|
2024-01-27 13:11:10 +01:00 |
|
Waldemar Tomme
|
16afe2b983
|
Transmit jokes to the audience
|
2024-01-27 13:08:34 +01:00 |
|
pytunia
|
09f75a688a
|
Bubbles and Squiggles.
|
2024-01-27 12:53:26 +01:00 |
|
pytunia
|
04178554f9
|
Bottle
|
2024-01-27 12:47:33 +01:00 |
|
Mikhail Aristov
|
91281d9cb7
|
make it work
|
2024-01-27 12:40:54 +01:00 |
|
Waldemar Tomme
|
f224391f30
|
Implement joke button signaling
|
2024-01-27 12:36:06 +01:00 |
|
pytunia
|
47015f4be4
|
Laughing faces.
|
2024-01-27 12:20:33 +01:00 |
|
Mikhail Aristov
|
6489729878
|
new mood logic
|
2024-01-27 12:02:06 +01:00 |
|
pytunia
|
ea4f7fc446
|
Art for bodies.
|
2024-01-27 11:45:28 +01:00 |
|
Waldemar Tomme
|
515c9eefc7
|
Add joke buttons
|
2024-01-27 11:38:38 +01:00 |
|
pytunia
|
7ec0ef6278
|
Stage art
|
2024-01-27 10:04:11 +01:00 |
|
pytunia
|
27bc30fb3b
|
Stage
|
2024-01-27 09:55:24 +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 |
|
Mikhail Aristov
|
b63482566f
|
new_faces
|
2024-01-26 21:35:53 +01:00 |
|
Mikhail Aristov
|
e9213d5ecc
|
post-merge fixes
|
2024-01-26 21:22:33 +01:00 |
|
Mikhail Aristov
|
8145f7ad86
|
Merge remote-tracking branch 'remotes/origin/stage'
|
2024-01-26 21:08:04 +01:00 |
Marvin Dalheimer
|
0c74bbcc07
|
reorder tables
|
2024-01-26 21:06:59 +01:00 |
|
Waldemar Tomme
|
41730b86dd
|
Tim can move now
|
2024-01-26 21:01:22 +01:00 |
|
Marvin Dalheimer
|
aa785eba06
|
Merge branch 'feature/crowd' into feat_faces
|
2024-01-26 20:58:29 +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 |
|
Mikhail Aristov
|
a33fc22afc
|
+faces logic
|
2024-01-26 20:53:36 +01:00 |
|
Waldemar Tomme
|
702c9563f1
|
Add tim sprite
|
2024-01-26 19:48:07 +01:00 |
|
Waldemar Tomme
|
2ec3dbae07
|
Add stage scene
|
2024-01-26 19:44:45 +01:00 |