[MASTER] 1.0 RELEASE #52

Merged

mr.zero merged 33 commits from develop into master 2026-04-30 15:55:21 +00:00

Conversation 0 Commits 33 Files Changed 53 +2736 -275

33 Commits

Author	SHA1	Message	Date
Zsolt Tasnadi	6a99ad76b8	set version to 1.0	2026-04-30 17:54:47 +02:00
mr.two	5094ba2b9c	Merge pull request 'feature/IMP-112-ascension-8-9' (#59) from feature/IMP-112-ascension-8-9 into develop ... Reviewed-on: #59	2026-04-29 21:27:23 +00:00
Zoltan Timar	44a7d10037	lint fix	2026-04-29 23:25:54 +02:00
Zoltan Timar	1b991f1f62	Merge branch 'feature/IMP-112-ascension-8-9' of https://git.teletype.hu/games/impostor into feature/IMP-112-ascension-8-9 ... # Conflicts: # inc/screen/screen.mysterious_man.lua	2026-04-29 23:21:42 +02:00
Zoltan Timar	0d569ccf56	correcting bugs and texts	2026-04-29 23:20:04 +02:00
Zsolt Tasnadi	77d6f95721	ascension flash label, scrollable menu	2026-04-29 23:15:22 +02:00
Zsolt Tasnadi	e2cd3d6dc7	linter fixes	2026-04-29 22:53:40 +02:00
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