Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upstream sync #674

Merged
merged 2 commits into from
Oct 25, 2024
Merged

Upstream sync #674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ecda537
Redid code glowing flats insertion
GTD-Carthage Oct 24, 2024
ddbb037
Merge pull request #178 from obsidian-level-maker/v21
GTD-Carthage Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions games/doom/resources.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,8 @@ Glow
T_CL43Y
T_CL43G
T_CL43P

GLOWFLTS
}

Texture "FWATER1", 0a0ac4, 128
Expand Down
1 change: 1 addition & 0 deletions games/heretic/resources.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,6 +667,7 @@ Glow
FLTTELE3
FLTTELE4

GLOWFLTS
}

// Texture "FLTWAWA1", 0a0ac4, 128
Expand Down
46 changes: 22 additions & 24 deletions modules/zdoom_otex.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,6 +518,24 @@ OTEX_SPECIAL_RESOURCES =
}
}

OTEX_GLOWING_FLATS =
[[
OBLODA01
OGOOPY01
OICYWA01
OLAVAA01
OLAVAA02
OLAVAB01
OLAVAC01
OLAVAD01
OLAVAE01
OLAVAF01
ONUKEA01
OSLUDG01
OPOOPY01
OTAR__01
OWATER01
]]

function OTEX_PROC_MODULE.setup(self)
PARAM.OTEX_module_activated = true
Expand Down Expand Up @@ -838,30 +856,10 @@ end


function OTEX_PROC_MODULE.all_done()
SCRIPTS.gldefs = ScriptMan_combine_script(SCRIPTS.gldefs,
[[
Glow
{
Flats
{
OBLODA01
OGOOPY01
OICYWA01
OLAVAA01
OLAVAA02
OLAVAB01
OLAVAC01
OLAVAD01
OLAVAE01
OLAVAF01
ONUKEA01
OSLUDG01
OPOOPY01
OTAR__01
OWATER01
}
}
]]
string.gsub(
GAME.RESOURCES.GLOWING_FLATS_GLDEFS,
"GLOWFLTS",
OTEX_GLOWING_FLATS
)
end

Expand Down