pytunia
|
1e4caae6c6
|
Merge remote-tracking branch 'origin/main' into art
|
2024-01-28 11:26:39 +01:00 |
|
pytunia
|
c09497686d
|
Empty commit.
|
2024-01-28 11:26:31 +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
|
146f309c94
|
+curtain in the score screen
|
2024-01-28 10:47:21 +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 |
|
pytunia
|
8014bab5d6
|
Merge remote-tracking branch 'origin/main' into art
|
2024-01-28 10:33:49 +01:00 |
|
pytunia
|
4545b144a9
|
Empty commit.
|
2024-01-28 10:33:35 +01:00 |
|
Waldemar Tomme
|
d92cbf66bf
|
Increase overall mood sensitivity/score
|
2024-01-28 10:30:18 +01:00 |
|
Mikhail Aristov
|
77f7b4c010
|
+custom logo
+custom icon
+custom splash screen
|
2024-01-28 10:28:29 +01:00 |
|
Mikhail Aristov
|
13e4047fad
|
+custom logos
|
2024-01-28 10:04:40 +01:00 |
|
Waldemar Tomme
|
b5bc64a581
|
Audience actually hears joke now at the end
|
2024-01-28 10:02:41 +01:00 |
|
Waldemar Tomme
|
91630979ec
|
Merge branch 'main' of git@192.168.8.1:tough_crowd into joke-effect-deferral
|
2024-01-28 09:51:53 +01:00 |
|
Mikhail Aristov
|
af50d4fc88
|
Merge branch 'main' of 192.168.8.1:tough_crowd
|
2024-01-28 09:46:20 +01:00 |
|
Mikhail Aristov
|
5b6a039132
|
+audience listening
+audience ignoring double jokes
|
2024-01-28 09:45:39 +01:00 |
|
Waldemar Tomme
|
9d826ce153
|
Audience hears the joke at the end of talking
|
2024-01-28 09:45:33 +01:00 |
|
Waldemar Tomme
|
a76cd29124
|
Disable joke buttons while talking and at game end
|
2024-01-28 09:16:46 +01:00 |
|
pytunia
|
bef92f242d
|
Merge remote-tracking branch 'origin/main' into art
|
2024-01-28 09:00:12 +01:00 |
|
pytunia
|
f077ff0f97
|
No change.
|
2024-01-28 08:54:10 +01:00 |
|
Waldemar Tomme
|
05227c75fd
|
Add tutorial scene
|
2024-01-28 07:28:55 +01:00 |
|
Mikhail Aristov
|
226313c974
|
post-merge engine fixes
|
2024-01-27 21:20:16 +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
|
a6494a9289
|
Make buttons visible again
|
2024-01-27 20:53:30 +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 |
|
Marvin Dalheimer
|
2c7128aafd
|
Add animations to Tim
|
2024-01-27 20:34:39 +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 |
|
Waldemar Tomme
|
177e59243b
|
Merge remote-tracking branch 'origin/main' into joke-stamina
|
2024-01-27 20:17:17 +01:00 |
|
Mikhail Aristov
|
3dd272eee8
|
disable overlay for now
|
2024-01-27 20:17:06 +01:00 |
|
Mikhail Aristov
|
e64963049c
|
+game over
|
2024-01-27 20:07:56 +01:00 |
|
Waldemar Tomme
|
6628362c8c
|
Add required joke stamina data
|
2024-01-27 19:58:18 +01:00 |
|
pytunia
|
86dec7501f
|
Walking and talking.
|
2024-01-27 19:34:08 +01:00 |
|
Mikhail Aristov
|
fa47248174
|
+stamina and mood display
|
2024-01-27 19:33:33 +01:00 |
|
pytunia
|
c1a1f9d1fb
|
Tim talks.
|
2024-01-27 19:24:15 +01:00 |
|
Mikhail Aristov
|
ce5c557a4c
|
+stamina and mood
|
2024-01-27 18:50:35 +01:00 |
|
Mikhail Aristov
|
6c617708a0
|
Merge branch 'main' of Y:\git\tough_crowd
|
2024-01-27 17:59:46 +01:00 |
|
Mikhail Aristov
|
84d2a3bbb0
|
+new assets
|
2024-01-27 17:59:29 +01:00 |
|
Marvin Dalheimer
|
a93ae0dcb3
|
Add nintendo controller
|
2024-01-27 17:52:51 +01:00 |
|
pytunia
|
16b43af80b
|
Adding tables and chairs.
|
2024-01-27 17:51:03 +01:00 |
|
Mikhail Aristov
|
694ecaf2fb
|
remove WASD movement
|
2024-01-27 17:42:38 +01:00 |
|
Marvin Dalheimer
|
21b96bc687
|
Rotate the bottles
|
2024-01-27 17:34:24 +01:00 |
|
Mikhail Aristov
|
7460acf72d
|
+key mappings
|
2024-01-27 17:23:26 +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 |