Commit Graph
27 Commits
Author SHA1 Message Date
mr.one 92a217c389 fixes
ci/woodpecker/push/woodpecker Pipeline failed
2026-04-29 20:45:03 +02:00
Zoltan Timar 3356d837c2 wpm modifies things
ci/woodpecker/push/woodpecker Pipeline failed
2026-04-29 17:20:07 +02:00
Zoltan Timar 3e31398d9d added 89 ascension
ci/woodpecker/push/woodpecker Pipeline failed
2026-04-29 16:20:11 +02:00
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 53c95bf17d lint fix
ci/woodpecker/push/woodpecker Pipeline was successful
2026-04-28 01:01:15 +02:00
Zoltan Timar 133980f569 Merge branch 'develop' into feature/imp-112-dialogues-and-asc-4-7
ci/woodpecker/push/woodpecker Pipeline failed
2026-04-28 00:52:22 +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
mr.zero 48d65424a0 Merge branch 'develop' into codegenerator
ci/woodpecker/push/woodpecker Pipeline was successful
2026-04-27 22:58:03 +02:00
mr.zero 47e5e0ca17 codegenerator
ci/woodpecker/push/woodpecker Pipeline was successful
2026-04-27 22:54:50 +02:00
Zoltan Timar 7df42dd2cd feat: added game over screen, fixed bar filling on ddr, applied tamagochi logic to game
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
ci/woodpecker/push/woodpecker Pipeline failed
2026-04-09 16:36:19 +02:00
mr.one 9a3c9ee28c - ddr special logic seems to be working in solation
ci/woodpecker/push/woodpecker Pipeline failed
2026-03-21 17:26:39 +01: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
mr.zero 6b4d47a438 success label border fix
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-20 07:06:52 +01:00
Zoltan Timar b4dcdaba58 feat: added ascension meter, done 0-1 asc logic, fixed mysterious man behaviours
ci/woodpecker/push/woodpecker Pipeline failed
ci/woodpecker/pr/woodpecker Pipeline failed
2026-03-19 18:22:06 +01:00
Zoltan Timar 5daf98fd06 feat: added new discussion functionality, implemented textbox draw functionality, added first discussion with sumphore to the street
ci/woodpecker/push/woodpecker Pipeline failed
ci/woodpecker/pr/woodpecker Pipeline failed
2026-03-12 17:08:08 +01:00
mr.zero 1c25a077a5 lint fixes
ci/woodpecker/push/woodpecker Pipeline was successful
2026-03-12 07:49:36 +01:00
mr.zero fd983dd6e1 doc fixes
ci/woodpecker/push/woodpecker Pipeline failed
2026-03-12 07:42:11 +01:00
mr.zero 3bb1fb7941 glitch
ci/woodpecker/push/woodpecker Pipeline failed
ci/woodpecker/pr/woodpecker Pipeline failed
ci/woodpecker/pull_request_closed/woodpecker Pipeline failed
2026-03-12 00:58:38 +01:00
mr.zero d1e7704d66 Day documentation 2026-03-11 23:41:27 +01:00
mr.zero 71a21f3f86 remove top bar in game window 2026-03-11 23:41:27 +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
ci/woodpecker/push/woodpecker Pipeline failed
ci/woodpecker/pr/woodpecker Pipeline failed
2026-03-09 16:20:50 +01:00
Zoltan Timar 3f2df7d512 feat: trigger logic implementation
ci/woodpecker/push/woodpecker Pipeline failed
ci/woodpecker/pr/woodpecker Pipeline failed
2026-03-05 20:26:23 +01:00
mr.zero f800cfff9b minigame init refact
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-05 19:14:12 +01:00
mr.zero cb19251556 Meter.draw
ci/woodpecker/push/woodpecker Pipeline was successful
2026-03-03 20:32:08 +01:00
mr.zero a732b5cbfa logic layer
ci/woodpecker/push/woodpecker Pipeline was successful
2026-03-03 20:14:57 +01:00