Zoltan Timar
|
395208f814
|
Merge branch 'develop' into feature/ascension_7_8
ci/woodpecker/push/woodpecker Pipeline failed
# Conflicts:
# impostor.inc
# inc/decision/decision.have_a_coffee.lua
# inc/decision/decision.sumphore_discussion.lua
# inc/screen/screen.mysterious_man.lua
# inc/screen/screen.walking_to_home.lua
# inc/screen/screen.walking_to_office.lua
# inc/window/window.menu.lua
|
2026-04-29 10:18:30 +02:00 |
|
mr.one
|
4cc0025f5e
|
sort-of progress, lots of bugs
ci/woodpecker/push/woodpecker Pipeline failed
|
2026-04-28 23:42:34 +02:00 |
|
Zoltan Timar
|
efe903110b
|
feat: added ascension logic 4-7, added new decision (eating fast food), indicating meter changes better, added discussions (needs more work, but meh ... fine like this)
ci/woodpecker/push/woodpecker Pipeline failed
|
2026-04-28 00:51:42 +02:00 |
|
Zoltan Timar
|
05091c7af2
|
feat: added sumphore & coworker discussions until asc 3, fixed game flow bugs, added mysterious man screen texts
ci/woodpecker/push/woodpecker Pipeline failed
|
2026-03-21 00:12:15 +01:00 |
|