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 |
|
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 |