Commit Graph

16 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
07bc598ae9 Added new menu to start at ASCENSION N when in test_mode.
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2026-04-28 00:55:35 +02:00
48d65424a0 Merge branch 'develop' into codegenerator
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2026-04-27 22:58:03 +02:00
47e5e0ca17 codegenerator
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2026-04-27 22:54:50 +02:00
Zoltan Timar
340d0ff78c Merge branch 'develop' into feature/imp-139-gameover-and-meters
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2026-04-27 22:28:08 +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
4ba02c894c credit window
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2026-04-27 21:22:38 +02:00
10316d3075 Controls menu 2026-04-02 18:51:17 +02:00
589b225ab0 remove configuration menu 2026-04-02 18:45:12 +02: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
cd85a7214c continued window
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2026-03-17 22:12:45 +01:00
4d8f01187b intro screens 2026-03-17 00:58:22 +01:00
Zoltan Timar
5daf98fd06 feat: added new discussion functionality, implemented textbox draw functionality, added first discussion with sumphore to the street
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
ci/woodpecker/pr/woodpecker Pipeline failed
2026-03-12 17:08:08 +01:00
5d78cffc99 end window
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
ci/woodpecker/pr/woodpecker Pipeline failed
ci/woodpecker/pull_request_closed/woodpecker Pipeline failed
2026-03-12 00:44:26 +01:00
Zoltan Timar
732c8b34c8 feat: added standard day cycle, added mysterious man screen, added work screen, added new decisions, placed minigames in their proposed space
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
ci/woodpecker/pr/woodpecker Pipeline failed
2026-03-09 16:20:50 +01:00
14b14ffc0c window.register.lua
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2026-02-22 21:26:59 +01:00