 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 |
|
|
Zoltan Timar
|
53c95bf17d
|
lint fix
ci/woodpecker/push/woodpecker Pipeline was successful
|
2026-04-28 01:01:15 +02:00 |
|
|
Zoltan Timar
|
9fc659c819
|
lint fix
ci/woodpecker/push/woodpecker Pipeline failed
|
2026-04-28 01:00:23 +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 |
|
|
Zoltan Timar
|
340d0ff78c
|
Merge branch 'develop' into feature/imp-139-gameover-and-meters
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
ci/woodpecker/push/woodpecker Pipeline failed
|
2026-04-27 22:26:16 +02:00 |
|
|
Zoltan Timar
|
e797377ec1
|
chore: lint fixes
ci/woodpecker/push/woodpecker Pipeline was successful
|
2026-04-09 16:40:19 +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 |
|
|
Zoltan Timar
|
fb8ae157b6
|
fix: lint
ci/woodpecker/push/woodpecker Pipeline was successful
|
2026-03-21 00:18:52 +01:00 |
|
|
Zoltan Timar
|
803ddc482b
|
Merge branch 'develop' into feature/imp-99-add-discussions
ci/woodpecker/push/woodpecker Pipeline failed
|
2026-03-21 00:17:08 +01:00 |
|
|
Zoltan Timar
|
ed14a86997
|
fix: lint
ci/woodpecker/push/woodpecker Pipeline failed
|
2026-03-21 00:16:38 +01:00 |
|
|
Zoltan Timar
|
9263a90961
|
fix: lint
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
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
ci/woodpecker/push/woodpecker Pipeline failed
|
2026-03-20 21:25:37 +01:00 |
|
|
Zoltan Timar
|
3e6fa41021
|
feat: added mm discussions
ci/woodpecker/push/woodpecker Pipeline failed
|
2026-03-20 18:23:17 +01:00 |
|
|
Zoltan Timar
|
ca883a15bd
|
fix: unknown var
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-19 18:26:04 +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
|
e40214c45b
|
fix: lint 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-12 18:14:42 +01:00 |
|
|
Zoltan Timar
|
b349ded281
|
feat: added intro sequence, fixed norman's sprite, placed him in various places
ci/woodpecker/push/woodpecker Pipeline failed
ci/woodpecker/pr/woodpecker Pipeline failed
|
2026-03-12 18:10:50 +01:00 |
|
|
Zoltan Timar
|
5346281c5c
|
fix: lint 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-12 17:10:24 +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 |
|
|
Zoltan Timar
|
f3846a283e
|
fix: fixing linter
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-09 16:25:11 +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
|
9b49e13a5d
|
fix: adding Trigger to luacheckrc
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 20:38:16 +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 |
|
|
Zoltan Timar
|
41f75da8c3
|
feat: added minifier, added minify step to makefile, added unminify step to makefile
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/pr/woodpecker Pipeline was successful
|
2026-02-26 22:41:58 +01:00 |
|
|
Zoltan Timar
|
1b64fd2392
|
Merge branch 'master' into feature/imp-30-stat-screen
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/pr/woodpecker Pipeline was successful
ci/woodpecker/pull_request_closed/woodpecker Pipeline was successful
|
2026-02-26 16:54:24 +01:00 |
|
|
Zoltan Timar
|
aaf1479a78
|
feat: stat screen on toilet with Focus overlay, screen draw callback added to manager, meter decay now only on timer revolution, timer visible on stat screen not minigames, Meter.get_timer_decay_percentage() added, Context.stat_screen_active flag added
ci/woodpecker/push/woodpecker Pipeline was successful
|
2026-02-26 16:54:00 +01:00 |
|
|
Zoltan Timar
|
66af47c483
|
feat: ring timer drawn at top-left of screen, Meter.set_timer_duration(f) controls speed, Meter.set_timer_decay(a) controls decay amount, all decay pauses during any minigame window
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/pr/woodpecker Pipeline was successful
ci/woodpecker/pull_request_closed/woodpecker Pipeline was successful
|
2026-02-26 15:43:39 +01:00 |
|
|
Zoltan Timar
|
954a39aef1
|
feat: added new functionality with focus, added base background to screens, created Focus.close(), Focus.start(), Focus.driven() methods for different use-cases, added focus to screens
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/pr/woodpecker Pipeline was successful
ci/woodpecker/pull_request_closed/woodpecker Pipeline was successful
|
2026-02-26 14:53:22 +01:00 |
|
|
Zoltan Timar
|
e0c3b446af
|
fix: make lint
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/pr/woodpecker Pipeline was successful
ci/woodpecker/pull_request_closed/woodpecker Pipeline was successful
|
2026-02-18 23:07:22 +01:00 |
|
|
Zoltan Timar
|
8832b6c833
|
feat: added meters, changed colors, removed unnecessary comments
|
2026-02-18 22:58:14 +01:00 |
|
|
Zoltan Timar
|
9014e36014
|
feat: moved minigames to their separate context
ci/woodpecker/push/woodpecker Pipeline was successful
|
2026-02-18 21:43:16 +01:00 |
|
|
Zoltan Timar
|
7b263bb454
|
fix: desition -> decision
ci/woodpecker/push/woodpecker Pipeline failed
|
2026-02-18 21:42:40 +01:00 |
|
|
Zoltan Timar
|
f553b09004
|
fix: added minigames description to Gemini.md, fixed song end note, fixed custom songs not loading, added another test song
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/pr/woodpecker Pipeline failed
ci/woodpecker/pull_request_closed/woodpecker Pipeline failed
|
2026-02-13 15:25:01 +01:00 |
|
|
Zoltan Timar
|
c9db82cce7
|
feat: added minigames (button_mash, rhythm, ddr), correction in makefiles readline, placed games in init.context
ci/woodpecker/push/woodpecker Pipeline failed
ci/woodpecker/pr/woodpecker Pipeline was successful
|
2026-02-12 16:31:03 +01:00 |
|