Mikhail Aristov
|
ba841c2eb2
|
Merge branch 'main' of 192.168.8.1:tough_crowd
|
2024-01-28 13:51:57 +01:00 |
Waldemar Tomme
|
440f560e9c
|
Merge branch 'main' of git@192.168.8.1:tough_crowd into joke-stamina-scaling
|
2024-01-28 13:50:59 +01:00 |
|
Waldemar Tomme
|
6c753bd7ad
|
Remove stamina categories from joke button
|
2024-01-28 13:50:37 +01:00 |
|
Mikhail Aristov
|
c03040184e
|
Merge remote-tracking branch 'remotes/origin/main' into clean_bloat
|
2024-01-28 13:50:04 +01:00 |
|
Waldemar Tomme
|
a55d6f04a0
|
Jokes now have an effectiveness scaling based on stamina
|
2024-01-28 13:47:34 +01:00 |
|
Mikhail Aristov
|
fae4164619
|
translations:
+ tutorial
+ credits
|
2024-01-28 13:47:32 +01:00 |
|
Mikhail Aristov
|
0785d10856
|
clean bloat
|
2024-01-28 13:35:03 +01:00 |
 Marvin Dalheimer
|
89e03cfd66
|
Merge branch 'feature/highlight'
|
2024-01-28 13:34:28 +01:00 |
|
Marvin Dalheimer
|
d44ac6ee02
|
Add a spotlight for Tim
|
2024-01-28 12:32:09 +01:00 |
|
Waldemar Tomme
|
cb9b905227
|
People outside target area now also stop losing mood while a joke is told
|
2024-01-28 12:19:52 +01:00 |
pytunia
|
afc81354df
|
Merge remote-tracking branch 'origin/main' into art
|
2024-01-28 12:10:37 +01:00 |
|
pytunia
|
db137d3e97
|
Walking distance and bubbles fix.
|
2024-01-28 12:09:22 +01:00 |
|
Waldemar Tomme
|
d527f9933f
|
Merge branch 'main' of git@192.168.8.1:tough_crowd into joke-bottle
|
2024-01-28 11:52:17 +01:00 |
|
Waldemar Tomme
|
64fcffb0f2
|
Bottles are now jokes
|
2024-01-28 11:51:33 +01:00 |
|
pytunia
|
e7ebfbd74d
|
Merge remote-tracking branch 'origin/main' into art
|
2024-01-28 11:29:33 +01:00 |
|
Marvin Dalheimer
|
8e4bc38a61
|
improve tutorial
|
2024-01-28 11:28:47 +01:00 |
|
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 |
|
Mikhail Aristov
|
46f65587c9
|
Merge branch 'main' of 192.168.8.1:tough_crowd
|
2024-01-28 11:25:22 +01:00 |
|
Mikhail Aristov
|
af692e1591
|
+logo in main menu
|
2024-01-28 11:24:37 +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 |