Commit Graph

181 Commits

Author SHA1 Message Date
e2cd3d6dc7 linter fixes 2026-04-29 22:53:40 +02:00
mr.one
92a217c389 fixes
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2026-04-29 20:45:03 +02:00
Zoltan Timar
3356d837c2 wpm modifies things
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2026-04-29 17:20:07 +02:00
Zoltan Timar
fe6f39e748 correction in mm text
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2026-04-29 16:50:06 +02:00
Zoltan Timar
b5596bbbe0 bugfixes
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2026-04-29 16:41:18 +02:00
Zoltan Timar
3e31398d9d added 89 ascension
Some checks failed
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
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
0ea538ce24 new end window
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2026-04-28 01:07:37 +02:00
Zoltan Timar
53c95bf17d lint fix
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2026-04-28 01:01:15 +02:00
Zoltan Timar
9fc659c819 lint fix
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2026-04-28 01:00:23 +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
Zoltan Timar
133980f569 Merge branch 'develop' into feature/imp-112-dialogues-and-asc-4-7
Some checks failed
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)
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2026-04-28 00:51:42 +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
3ed06353b8 Drawing both sides of the home screen.
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2026-04-27 18:22:41 +02:00
0b8e2368ec set version to 1.0-beta3
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2026-04-09 21:55:48 +02:00
ae3415b417 main menu color fix
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2026-04-09 21:44:52 +02:00
ce819eae2b Merge branch 'develop' into feature/task110_sprite_silhouette
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2026-04-09 21:37:23 +02:00
658e6908b5 Merge pull request '- task #134: randomize placement of characters' (#49) from feature/134-randomized-character-positions into develop
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: #49
2026-04-09 19:05:27 +00:00
5ae1eec48a - task #134: randomize placement of characters
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2026-04-09 20:47:59 +02:00
Zoltan Timar
e797377ec1 chore: lint fixes
All checks were successful
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
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2026-04-09 16:36:19 +02:00
9b379d32b3 Corrects the color defects in tiles.
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2026-04-09 15:58:54 +02:00
5fc6ae5c14 Draws outlines around the figures.
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2026-04-09 15:48:04 +02:00
1e3716196e Removes the setting of the transparent color to fix the linter error.
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2026-04-09 13:54:43 +02:00
4b5f11969b Changes the Norman's silhouette. Change the background color of the sprites to pink.
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2026-04-09 13:47:24 +02:00
a4a6ad2ab2 Introduces the transparent color. The default is the pink. 2026-04-09 13:46:05 +02:00
8921f02821 mouse handling refact
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2026-04-02 22:12:58 +02:00
211af18c26 debug mode fix
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2026-04-02 21:51:43 +02:00
b337ae8516 main menu tweaks
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2026-04-02 19:12:39 +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
7697b35336 input remapping + mouse control
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2026-04-02 18:39:36 +02:00
6e1cf1db3e remove situation management 2026-04-02 15:32:20 +02:00
020bfd4134 set version to beta2
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2026-03-23 07:02:39 +01:00
8e610f14a0 new ddr2 game
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2026-03-22 23:47:12 +01: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
8b0bcdbe95 - lint fixes
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2026-03-22 22:24:36 +01:00
7c3a011ffc - lint fixes
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2026-03-22 22:10:56 +01:00
6ee874655e - lint fix :D 2026-03-22 22:06:35 +01:00
3420694287 - linter fixes
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2026-03-22 21:55:12 +01:00
e12a27e4e1 - linter fixes
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2026-03-22 21:53:51 +01:00
81b47c3760 rle screens 2026-03-22 21:53:29 +01:00