Skip to content

Commit 09b43fd

Browse files
authored
Merge pull request #162 from Lyall/2.5.0
2.5.0 update
2 parents 327c3b5 + 4748f23 commit 09b43fd

65 files changed

Lines changed: 2034 additions & 961 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/create_release.yaml

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
name: create-release
1+
name: Create Release
22

33
on:
44
workflow_dispatch:
5-
inputs:
6-
version:
7-
description: 'Release version number'
8-
required: true
9-
5+
106
jobs:
117
build:
128
runs-on: windows-latest
@@ -15,11 +11,26 @@ jobs:
1511
steps:
1612
- uses: actions/checkout@v4
1713
with:
18-
submodules: 'true'
14+
submodules: recursive
15+
16+
- name: Extract version from version.h
17+
id: extract_version
18+
shell: bash
19+
run: |
20+
VERSION_FILE="src/resources/version.h"
21+
echo "Reading version from $VERSION_FILE"
22+
23+
version_line=$(grep '#define VERSION_STRING' "$VERSION_FILE")
24+
echo "Found line: $version_line"
25+
26+
version=$(echo "$version_line" | sed -E 's/#define VERSION_STRING +"([^"]+)"/\1/')
27+
echo "Parsed version: $version"
28+
29+
echo "version=$version" >> $GITHUB_OUTPUT
1930
2031
- name: setup-msbuild
2132
uses: microsoft/setup-msbuild@v1.1
22-
33+
2334
- run: msbuild ${{ github.event.repository.name }}.sln -t:rebuild -verbosity:diag -property:Configuration=Release -property:Platform=x64
2435
- run: cp x64\Release\${{ github.event.repository.name }}.asi ${{ github.event.repository.name }}.asi
2536

@@ -29,7 +40,7 @@ jobs:
2940
latest: true
3041
fileName: "Ultimate-ASI-Loader_x64.zip"
3142
- run: unzip Ultimate-ASI-Loader_x64.zip -d .\
32-
- run: C:\msys64\usr\bin\wget.exe -O .\UltimateASILoader_LICENSE.md https://raw.githubusercontent.com/ThirteenAG/Ultimate-ASI-Loader/master/license
43+
- run: C:\msys64\usr\bin\wget.exe -O .\UltimateASILoader_LICENSE.md https://raw.githubusercontent.com/ThirteenAG/Ultimate-ASI-Loader/master/license
3344
- run: cp .\dinput8.dll .\wininet.dll
3445
- run: mv .\dinput8.dll .\winhttp.dll
3546
- run: mkdir .\logs
@@ -38,18 +49,16 @@ jobs:
3849
- run: mv .\README.md .\plugins\${{ github.event.repository.name }}_README.md
3950
- run: mv .\${{ github.event.repository.name }}.ini .\plugins\${{ github.event.repository.name }}.ini
4051
- run: mv .\${{ github.event.repository.name }}.asi .\plugins\${{ github.event.repository.name }}.asi
41-
- run: 7z a -tzip ${{ github.event.repository.name }}_${{ github.event.inputs.version }}.zip wininet.dll winhttp.dll UltimateASILoader_LICENSE.md
42-
- run: 7z a ${{ github.event.repository.name }}_${{ github.event.inputs.version }}.zip plugins\
43-
- run: 7z a ${{ github.event.repository.name }}_${{ github.event.inputs.version }}.zip logs\
52+
- run: 7z a -tzip ${{ github.event.repository.name }}_${{ steps.extract_version.outputs.version }}.zip wininet.dll winhttp.dll UltimateASILoader_LICENSE.md
53+
- run: 7z a ${{ github.event.repository.name }}_${{ steps.extract_version.outputs.version }}.zip plugins\
54+
- run: 7z a ${{ github.event.repository.name }}_${{ steps.extract_version.outputs.version }}.zip logs\
4455

45-
4656
- uses: ncipollo/release-action@v1
4757
with:
48-
artifacts: "${{ github.event.repository.name }}_${{ github.event.inputs.version }}.zip"
58+
artifacts: "${{ github.event.repository.name }}_${{ steps.extract_version.outputs.version }}.zip"
4959
token: ${{ secrets.GITHUB_TOKEN }}
50-
tag: ${{ github.event.inputs.version }}
51-
name: "${{ github.event.inputs.version }}"
60+
tag: ${{ steps.extract_version.outputs.version }}
61+
name: "${{ steps.extract_version.outputs.version }}"
5262
draft: true
5363
generateReleaseNotes: true
5464
artifactErrorsFailBuild: true
55-

.github/workflows/msbuild.yml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: MGSHDFix CI Builds
2+
3+
on:
4+
push:
5+
branches: [ "master" ]
6+
pull_request:
7+
branches: [ "master" ]
8+
9+
permissions:
10+
contents: read
11+
12+
jobs:
13+
build:
14+
runs-on: windows-latest
15+
16+
steps:
17+
- uses: actions/checkout@v4
18+
with:
19+
submodules: recursive
20+
21+
- name: setup-msbuild
22+
uses: microsoft/setup-msbuild@v1.1
23+
24+
- run: msbuild ${{ github.event.repository.name }}.sln -t:rebuild -verbosity:diag -property:Configuration=Release -property:Platform=x64
25+
- run: mkdir .\dist
26+
- run: cp x64\Release\${{ github.event.repository.name }}.asi ${{ github.event.repository.name }}.asi
27+
28+
- uses: robinraju/release-downloader@v1.8
29+
with:
30+
repository: "ThirteenAG/Ultimate-ASI-Loader"
31+
latest: true
32+
fileName: "Ultimate-ASI-Loader_x64.zip"
33+
- run: unzip Ultimate-ASI-Loader_x64.zip -d .\dist
34+
- run: C:\msys64\usr\bin\wget.exe -O .\dist\UltimateASILoader_LICENSE.md https://raw.githubusercontent.com/ThirteenAG/Ultimate-ASI-Loader/master/license
35+
- run: cp .\dist\dinput8.dll .\dist\wininet.dll
36+
- run: mv .\dist\dinput8.dll .\dist\winhttp.dll
37+
- run: mkdir .\dist\logs
38+
- run: cp .\README.md .\dist\logs\${{ github.event.repository.name }}.log
39+
- run: mkdir .\dist\plugins
40+
- run: mv .\README.md .\dist\plugins\${{ github.event.repository.name }}_README.md
41+
- run: mv .\${{ github.event.repository.name }}.ini .\dist\plugins\${{ github.event.repository.name }}.ini
42+
- run: mv .\${{ github.event.repository.name }}.asi .\dist\plugins\${{ github.event.repository.name }}.asi
43+
44+
- name: Create release zip
45+
run: |
46+
7z a -tzip ${{ github.event.repository.name }}-run-${{ github.run_number }}.zip dist\
47+
48+
- name: Upload Artifact
49+
uses: actions/upload-artifact@v4
50+
with:
51+
name: ${{ github.event.repository.name }}-run-${{ github.run_number }}
52+
path: dist/

.gitmodules

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77
url = https://github.com/gabime/spdlog
88
[submodule "external/safetyhook"]
99
path = external/safetyhook
10-
url = ../../cursey/safetyhook
10+
url = https://github.com/cursey/safetyhook
1111
[submodule "external/zydis"]
1212
path = external/zydis
13-
url = ../../zyantific/zydis
13+
url = https://github.com/zyantific/zydis
14+
[submodule "external/SteamworksSDK"]
15+
path = external/SteamworksSDK
16+
url = https://github.com/rlabrecque/SteamworksSDK

MGSHDFix.filters

Lines changed: 0 additions & 41 deletions
This file was deleted.

MGSHDFix.ini

Lines changed: 50 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ MSXGame = MG1
8282
MSXWallType = 0
8383
; MSXWallAlign (MG1/MG2 only): orientation of game screen (L, R, or C for center)
8484
MSXWallAlign = C
85-
85+
8686
[Force Stereo Audio]
8787
; If your Windows audio output device is INCORRECTLY set to output 5.1 audio, the game will output sounds to audio channels that do not exist.
8888
; For example, codec/radio conversations will be FAR QUIETER than other sound effects (such as rain), or outright missing throughout the game.
@@ -92,6 +92,10 @@ MSXWallAlign = C
9292
; If enabled, the game is forced to output stereo audio.
9393
Enabled = false
9494

95+
[Mute Warning]
96+
; When enabled, a visible warning will be displayed on startup if game audio is muted via the launcher's audio settings.
97+
Enabled = true
98+
9599
[Skip Intro Logos]
96100
; Skips the unskippable KONAMI etc logo images on startup, skippable intro videos will still be played
97101
; Skipping logos for MG1 / MG2 (the MSX games) not currently supported.
@@ -113,29 +117,59 @@ Y Multiplier = 1
113117
; Setting to the game default of 128 or lower will disable extending
114118
SizeMB = 128
115119

116-
[Pause on Focus Loss]
120+
[Pause On Focus Loss]
117121
; If the game should pause when alt-tabbed.
118122
; Default / vanilla behavior is true.
119-
PauseOnFocusLoss = true
120-
; Fixes assets not loading properly when alt-tabbed during level transitions & cutscenes.
121-
; Speedrunners utilize the vanilla/bugged behavior where assets don't load properly to skip forced codec calls,
122-
; though it can also result in doors not loading properly - softlocking the game.
123-
; Generally want this set to true.
124-
CutsceneLoadingFix = true
125-
126-
[MG1 Custom Loading Screens]
127-
; Adds support for 1080p/1440p/4k loading screens to MG1/MG2 while using a custom Output Resolution.
128-
; Place custom loading screens in "MG and MG2\Misc\loading\_win"
129-
; load_fh.ctxr, load_wq.ctxr, load_4k.ctxr, load_fh_jp.ctxr, load_wq_jp.ctxr, load_4k_jp.ctxr
130-
Enabled = false
131-
123+
Enabled = true
124+
; MGSHDFix fixes assets sometimes not loading properly when alt-tabbed during level transitions & cutscenes.
125+
; Speedrunners often utilize this vanilla/bugged behavior where assets don't load properly to skip forced codec calls,
126+
; though it can also result in doors not loading properly - softlocking the game, or timers breaking cutscenes, causing a crash.
127+
; Setting this override to true will disable MGSHDFix's bugfixes.
128+
SpeedrunnerBugfixOverride = false
132129

133130
;;;;;;;;;; MGSHDFix / Internal Settings ;;;;;;;;;;
134131

132+
[Update Notifications]
133+
; If set to true, MGSHDFix will notify you when launching the game if a new MGSHDFix update is available for download.
134+
CheckForUpdates = true
135+
; If you want console notification when starting the game if a MGSHDFix update is available.
136+
; Update notifications will still be printed to the log file when set to false.
137+
ConsoleNotifications = true
138+
135139
[Verbose Logging]
136140
; Outputs additional information to the MGSHDFix.log file to assist in debugging.
137141
Enabled = false
138142

143+
[Debug]
144+
Explosion1 = 150
145+
Explosion2 = 150
146+
Explosion3 = 150
147+
Explosion4 = 150
148+
Explosion5 = 150
149+
Explosion6 = 150
150+
Explosion7 = 150
151+
Explosion8 = 150
152+
Explosion9 = 150
153+
Explosion10 = 150
154+
Explosion11 = 150
155+
Explosion12 = 150
156+
Explosion13 = 1
157+
Explosion14 = 1
158+
Explosion15 = 1207
159+
Explosion16 = 1207
160+
Explosion17 = 1
161+
Explosion18 = 1
162+
Explosion19 = 150
163+
Explosion20 = 150
164+
Explosion21 = 150
165+
Explosion22 = 150
166+
Explosion23 = 150
167+
Explosion24 = 150
168+
Explosion25 = 150
169+
Explosion26 = 1207
170+
Explosion27 = 1207
171+
Explosion28 = 1207
172+
139173
[Config Version]
140174
;Keep this at the bottom
141-
Version = 2
175+
Version = 3

0 commit comments

Comments
 (0)