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

v2.6.2.5 Beta #674

Merged
merged 3 commits into from
Mar 31, 2024
Merged

v2.6.2.5 Beta #674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1c5b05
fix DXRando singleton reference, set to None in Pretravel
Die4Ever Mar 31, 2024
91efed7
installer tweaks to text for Vanilla Fixer
Die4Ever Mar 31, 2024
a457adf
v2.6.2.5 Beta builds
Die4Ever Mar 31, 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: 1 addition & 1 deletion DXRCore/DeusEx/Classes/DXRVersion.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ simulated static function CurrentVersion(optional out int major, optional out in
major=2;
minor=6;
patch=2;
build=4;//build can't be higher than 99
build=5;//build can't be higher than 99
}

simulated static function bool VersionIsStable()
Expand Down
5 changes: 5 additions & 0 deletions DXRCore/DeusEx/Classes/DXRando.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,11 @@ function DXRInit()
RandoEnter();
}

simulated event PreTravel()
{
default.dxr = None;// clear the singleton reference
}

function CheckConfig()
{
local int i;
Expand Down
Binary file modified DeusEx.u
View file
Open in desktop
Binary file not shown.
Binary file modified GMDXRandomizer.u
View file
Open in desktop
Binary file not shown.
Binary file modified HXRandomizer.u
View file
Open in desktop
Binary file not shown.
Binary file modified RevRandomizer.u
View file
Open in desktop
Binary file not shown.
Binary file modified VMDRandomizer.u
View file
Open in desktop
Binary file not shown.
9 changes: 6 additions & 3 deletions installer/GUI/InstallerWindow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ def initWindow(self):
self.width = 350
self.height = 500
self.lastprogress = ''
self.root.title("Deus Ex Randomizer " + GetVersion() + " Installer")
if IsVanillaFixer():
self.root.title("DXR Vanilla Fixer " + GetVersion())
else:
self.root.title("DXRando " + GetVersion() + " Installer")

self.dxvk_default = CheckVulkan()# this takes a second or so
self.ogl2_default = self.dxvk_default or not IsWindows()
Expand Down Expand Up @@ -114,7 +117,7 @@ def InitFlavorSettings(self, f: str, row, pad) -> int:
v = BooleanVar(master=self.frame, value=IsVanillaFixer())
settings['ZeroRando'] = v
c = Checkbutton(self.frame, text="Default to Zero Rando mode for "+f, variable=v)
Hovertip(c, "This retains the vanilla menu experience for your first launch.\nAnd also sets Zero Rando mode as your default game mode for a new game.")
Hovertip(c, "This retains the vanilla menu experience for your first launch.\nAnd also sets Zero Rando mode as your default game mode for a new game.\nYou can change this once you get into the game with the Rando menu.")
c.grid(column=1,row=row, sticky='SW', padx=pad*10, pady=pad)
self.FixColors(c)
row+=1
Expand Down Expand Up @@ -179,7 +182,7 @@ def LDDPCheckbox(self, row, padx, pady):
def GlobalFixes(self, row, pad):
# engine.dll speedup fix, this is global
self.speedupfixval = BooleanVar(master=self.frame, value=True)
self.speedupfix = Checkbutton(self.frame, text="Apply Engine.dll speedup fix to support higher frame rates.", variable=self.speedupfixval)
self.speedupfix = Checkbutton(self.frame, text="Apply Engine.dll speedup fix\nto support higher frame rates.", variable=self.speedupfixval)
self.speedupfix.grid(column=1,row=row, sticky='SW', padx=pad, pady=pad)
Hovertip(self.speedupfix, "Fixes issues with high frame rates.")
self.FixColors(self.speedupfix)
Expand Down