[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

mr.zero commented 2026-04-09 19:57:10 +00:00

Owner

Copy Link

No description provided.

mr.zero added 1 commit 2026-04-09 19:57:10 +00:00

set version to 1.0-beta3 0b8e2368ec

mr.three added 2 commits 2026-04-27 16:24:35 +00:00

Drawing both sides of the home screen. 3ed06353b8

Merge pull request 'Drawing both sides of the home screen.' (#54) from feature/task106_home_screen into develop ... 98fd6981cc

Reviewed-on: #54

mr.zero added 2 commits 2026-04-27 19:23:49 +00:00

credit window 4ba02c894c

Merge pull request 'credit window' (#55) from credits-window into develop ... 5d4aa1ee26

Reviewed-on: #55

mr.two added 3 commits 2026-04-27 20:39:50 +00:00

feat: added game over screen, fixed bar filling on ddr, applied tamagochi logic to game 7df42dd2cd

Merge branch 'develop' into feature/imp-139-gameover-and-meters 340d0ff78c

Merge pull request 'feature/imp-139-gameover-and-meters' (#56) from feature/imp-139-gameover-and-meters into develop ... b5dd0cc686

Reviewed-on: #56

mr.zero added 3 commits 2026-04-27 21:00:23 +00:00

codegenerator 47e5e0ca17

Merge branch 'develop' into codegenerator 48d65424a0

Merge pull request 'codegenerator' (#57) from codegenerator into develop ... 2812b0c17a

Reviewed-on: #57

mr.zero added 1 commit 2026-04-27 21:33:31 +00:00

alphabetize luacheck config 73b2a88437

mr.two added 5 commits 2026-04-27 23:02:54 +00:00

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) efe903110b

Merge branch 'develop' into feature/imp-112-dialogues-and-asc-4-7 133980f569

lint fix 9fc659c819

lint fix 53c95bf17d

Merge pull request 'feature/imp-112-dialogues-and-asc-4-7' (#58) from feature/imp-112-dialogues-and-asc-4-7 into develop ... 629a27cfa8

Reviewed-on: #58

mr.zero added 1 commit 2026-04-27 23:07:41 +00:00

new end window 0ea538ce24

mr.two added 14 commits 2026-04-29 21:27:24 +00:00

Added new menu to start at ASCENSION N when in test_mode. 07bc598ae9

sort-of progress, lots of bugs 4cc0025f5e

Merge branch 'develop' into feature/ascension_7_8 ... 395208f814

# 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

added 89 ascension 3e31398d9d

bugfixes b5596bbbe0

correction in mm text fe6f39e748

wpm modifies things 3356d837c2

fixes 92a217c389

linter fixes e2cd3d6dc7

ascension flash label, scrollable menu 77d6f95721

correcting bugs and texts 0d569ccf56

Merge branch 'feature/IMP-112-ascension-8-9' of https://git.teletype.hu/games/impostor into feature/IMP-112-ascension-8-9 ... 1b991f1f62

# Conflicts:
#	inc/screen/screen.mysterious_man.lua

lint fix 44a7d10037

Merge pull request 'feature/IMP-112-ascension-8-9' (#59) from feature/IMP-112-ascension-8-9 into develop ... 5094ba2b9c

Reviewed-on: #59

mr.zero added 1 commit 2026-04-30 15:54:53 +00:00

set version to 1.0 6a99ad76b8

mr.zero changed title from [MASTER] 1.0-beta3 to [MASTER] 1.0 RELEASE 2026-04-30 15:55:12 +00:00

mr.zero merged commit c279b98800 into master 2026-04-30 15:55:21 +00:00

mr.zero referenced this issue from a commit 2026-04-30 15:55:22 +00:00

Merge pull request '[MASTER] 1.0 RELEASE' (#52) from develop into master

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

No items

No Label

Milestone

No items

No Milestone

Assignees

Clear assignees

mr.one mr.three mr.two mr.zero

No Assignees

3 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: games/impostor#52