309 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
mr.one	92a217c389	fixes	2026-04-29 20:45:03 +02:00
Zoltan Timar	3356d837c2	wpm modifies things	2026-04-29 17:20:07 +02:00
Zoltan Timar	fe6f39e748	correction in mm text	2026-04-29 16:50:06 +02:00
Zoltan Timar	b5596bbbe0	bugfixes	2026-04-29 16:41:18 +02:00
Zoltan Timar	3e31398d9d	added 89 ascension	2026-04-29 16:20:11 +02:00
Zoltan Timar	395208f814	Merge branch 'develop' into feature/ascension_7_8 ... # 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	2026-04-28 23:42:34 +02:00
Zsolt Tasnadi	0ea538ce24	new end window	2026-04-28 01:07:37 +02:00
mr.two	629a27cfa8	Merge pull request 'feature/imp-112-dialogues-and-asc-4-7' (#58) from feature/imp-112-dialogues-and-asc-4-7 into develop ... Reviewed-on: #58	2026-04-27 23:02:51 +00:00
Zoltan Timar	53c95bf17d	lint fix	2026-04-28 01:01:15 +02:00
Zoltan Timar	9fc659c819	lint fix	2026-04-28 01:00:23 +02:00
mr.one	07bc598ae9	Added new menu to start at ASCENSION N when in test_mode.	2026-04-28 00:55:35 +02:00
Zoltan Timar	133980f569	Merge branch 'develop' into feature/imp-112-dialogues-and-asc-4-7	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)	2026-04-28 00:51:42 +02:00
Zsolt Tasnadi	73b2a88437	alphabetize luacheck config	2026-04-27 23:33:07 +02:00
Zsolt Tasnadi	2812b0c17a	Merge pull request 'codegenerator' (#57) from codegenerator into develop ... Reviewed-on: #57	2026-04-27 21:00:21 +00:00
Zsolt Tasnadi	48d65424a0	Merge branch 'develop' into codegenerator	2026-04-27 22:58:03 +02:00
Zsolt Tasnadi	47e5e0ca17	codegenerator	2026-04-27 22:54:50 +02:00
mr.two	b5dd0cc686	Merge pull request 'feature/imp-139-gameover-and-meters' (#56) from feature/imp-139-gameover-and-meters into develop ... Reviewed-on: #56	2026-04-27 20:39:48 +00:00
Zoltan Timar	340d0ff78c	Merge branch 'develop' into feature/imp-139-gameover-and-meters	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	2026-04-27 22:26:16 +02:00
Zsolt Tasnadi	5d4aa1ee26	Merge pull request 'credit window' (#55) from credits-window into develop ... Reviewed-on: #55	2026-04-27 19:23:47 +00:00
Zsolt Tasnadi	4ba02c894c	credit window	2026-04-27 21:22:38 +02:00
mr.three	98fd6981cc	Merge pull request 'Drawing both sides of the home screen.' (#54) from feature/task106_home_screen into develop ... Reviewed-on: #54	2026-04-27 16:24:33 +00:00
Bela Mezo	3ed06353b8	Drawing both sides of the home screen.	2026-04-27 18:22:41 +02:00
Zsolt Tasnadi	0b8e2368ec	set version to 1.0-beta3	2026-04-09 21:55:48 +02:00
mr.three	ff96ca963d	Merge pull request 'feature/task110_sprite_silhouette' (#51) from feature/task110_sprite_silhouette into develop ... Reviewed-on: #51	2026-04-09 19:47:28 +00:00
Zsolt Tasnadi	ae3415b417	main menu color fix	2026-04-09 21:44:52 +02:00
Bela Mezo	ce819eae2b	Merge branch 'develop' into feature/task110_sprite_silhouette	2026-04-09 21:37:23 +02:00
mr.one	658e6908b5	Merge pull request '- task #134: randomize placement of characters' (#49) from feature/134-randomized-character-positions into develop ... Reviewed-on: #49	2026-04-09 19:05:27 +00:00
Tari Balázs	5ae1eec48a	- task #134: randomize placement of characters	2026-04-09 20:47:59 +02:00
mr.two	04eb825646	Merge pull request 'IMP-133: 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' (#48) from chore/imp-133-improve-readability into develop ... Reviewed-on: #48	2026-04-09 14:41:43 +00:00
Zoltan Timar	e797377ec1	chore: lint fixes	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	2026-04-09 16:36:19 +02:00
Bela Mezo	9b379d32b3	Corrects the color defects in tiles.	2026-04-09 15:58:54 +02:00
Bela Mezo	5fc6ae5c14	Draws outlines around the figures.	2026-04-09 15:48:04 +02:00
Bela Mezo	1e3716196e	Removes the setting of the transparent color to fix the linter error.	2026-04-09 13:54:43 +02:00
Bela Mezo	4b5f11969b	Changes the Norman's silhouette. Change the background color of the sprites to pink.	2026-04-09 13:47:24 +02:00
Bela Mezo	a4a6ad2ab2	Introduces the transparent color. The default is the pink.	2026-04-09 13:46:05 +02:00
Zsolt Tasnadi	8921f02821	mouse handling refact	2026-04-02 22:12:58 +02:00
Zsolt Tasnadi	211af18c26	debug mode fix	2026-04-02 21:51:43 +02:00
Zsolt Tasnadi	b337ae8516	main menu tweaks	2026-04-02 19:12:39 +02:00
Zsolt Tasnadi	10316d3075	Controls menu	2026-04-02 18:51:17 +02:00
Zsolt Tasnadi	589b225ab0	remove configuration menu	2026-04-02 18:45:12 +02:00
Zsolt Tasnadi	7697b35336	input remapping + mouse control	2026-04-02 18:39:36 +02:00
Zsolt Tasnadi	6e1cf1db3e	remove situation management	2026-04-02 15:32:20 +02:00
Zsolt Tasnadi	020bfd4134	set version to beta2	2026-03-23 07:02:39 +01:00
Zsolt Tasnadi	87d4f5843b	Merge pull request 'beta1 release' (#46) from develop into master ... Reviewed-on: #46	2026-03-22 22:49:23 +00:00
Zsolt Tasnadi	8e610f14a0	new ddr2 game	2026-03-22 23:47:12 +01:00
Zsolt Tasnadi	753509b4ea	Merge branch 'develop' into rle-screens	2026-03-22 23:17:45 +01:00