Commit Graph

21 Commits

Author SHA1 Message Date
Zoltan Timar
395208f814 Merge branch 'develop' into feature/ascension_7_8
Some checks failed
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
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2026-04-28 23:42:34 +02:00
Zoltan Timar
9fc659c819 lint fix
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2026-04-28 01:00:23 +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)
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2026-04-28 00:51:42 +02:00
Zoltan Timar
7df42dd2cd feat: added game over screen, fixed bar filling on ddr, applied tamagochi logic to game
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2026-04-27 22:26:16 +02:00
Zoltan Timar
9d56ca2e7a chore: re-added have_a_coffee discussion, fixed text readability, fixed centering of texts, new system.ui functions for drawing in contour, fixed ddr types, fixed meter drawing
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2026-04-09 16:36:19 +02:00
7697b35336 input remapping + mouse control
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2026-04-02 18:39:36 +02:00
753509b4ea Merge branch 'develop' into rle-screens
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2026-03-22 23:17:45 +01:00
7dbbbb4668 day switch and ddr backgrounds
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2026-03-22 23:13:34 +01:00
3290d0fb89 Merge branch 'feature/ddr_upgrade' into develop
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2026-03-22 22:30:20 +01:00
53ccda7702 - updated decision texts for less grammatical errors
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
- fixed for "only_left" game maxing out before special win
- game ends with TO BE CONTINUED at ASC 4
2026-03-22 21:42:13 +01:00
2912d7c482 RLE lib
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2026-03-22 21:21:27 +01:00
284c5aa4c8 time based scroll
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2026-03-22 19:03:05 +01:00
6a33be82e9 - added music and sounds to things
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
- hooked up ddr logic into game logic
- TODO: "left_only" ddr needs tweak
2026-03-21 23:20:48 +01:00
Zoltan Timar
9263a90961 fix: lint
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2026-03-21 00:15:18 +01:00
Zoltan Timar
05091c7af2 feat: added sumphore & coworker discussions until asc 3, fixed game flow bugs, added mysterious man screen texts
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2026-03-21 00:12:15 +01:00
Zoltan Timar
f79233521d fix: removed mm window, made it into screen
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2026-03-20 21:25:37 +01:00
6a6d5ab1fe Try to fix the linter warnings.
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/pr/woodpecker Pipeline was successful
ci/woodpecker/pull_request_closed/woodpecker Pipeline was successful
2026-03-18 22:32:01 +01:00
6807f7ae7f Fix the linter warnings again.
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
ci/woodpecker/pr/woodpecker Pipeline failed
2026-03-18 22:30:30 +01:00
c8d8999ba3 Fix the linter issue.
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
ci/woodpecker/pr/woodpecker Pipeline failed
2026-03-18 22:13:42 +01:00
c8073aff02 Adds the mysterious screen.
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
ci/woodpecker/pr/woodpecker Pipeline failed
2026-03-18 22:08:54 +01:00