Repository navigation
feat(online): Add a Network options section and keep scroll speed in Options.ini - #655
Draft
tintinhamans wants to merge 24 commits into
Draft
tintinhamans wants to merge 24 commits into
tintinhamans wants to merge 24 commits into
Conversation
tintinhamans
force-pushed
the
arctic/go/feat/network-options-menu
branch
2 times, most recently
from
October 25, 2026 02:38
e9b3142 to
fcd3e33
Compare
tintinhamans
force-pushed
the
arctic/go/feat/network-options-menu
branch
2 times, most recently
from
October 25, 2026 11:15
4002010 to
9198a6b
Compare
tintinhamans
force-pushed
the
arctic/go/feat/network-options-menu
branch
2 times, most recently
from
October 26, 2026 15:39
78c4077 to
116f34e
Compare
…m::openArchiveFile() (TheSuperHackers#3376)
…leSystem, Win32LocalFileSystem (TheSuperHackers#3374)
…ile::getFileInfo(), StdBIGFile::getFileInfo() (TheSuperHackers#3415)
…ystem into BIGFileSystem (TheSuperHackers#3505)
…e loadBigFilesFromDirectory (TheSuperHackers#3505)
…riting archive first
…only with verbose logging
tintinhamans
force-pushed
the
arctic/go/feat/network-options-menu
branch
from
October 28, 2026 01:47
116f34e to
eff2278
Compare
tintinhamans
force-pushed
the
arctic/go/feat/network-options-menu
branch
from
October 28, 2026 19:15
eff2278 to
5000b87
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge after #646 and #671.
Adds a Network section to the options menu for the settings from #646, with Online and LAN tabs: Proxy (Automatic, Disabled, Custom), Server (Automatic, Custom), and the LAN IP. The resolved proxy or host shows in the disabled fields. Cancel after a failed Accept test drops only the connection changes. The dropdowns need the open list click fix of #671. The options panel now fits inside the shell frame, 399 by 511 units with the same padding around and inside every section.
The game version moves from the options menu to the bottom left of the shell frame. It is drawn on the frame on every shell screen that has one and is gone in game.
Settings cleanup: the unused
stats_overlayis removed.camera.move_speed_ratiois removed and migrated intoScrollFactorinOptions.iniasold * ratio * (width / 2) / (1.6 * 400), clamped below at 1 like upstream (TheSuperHackers#1262), so 1.0 at 2560x1440 gives 100. That formula assumes the right mouse scroll drag of #671, which is measured at 800x600, so the scroll speed no longer depends on the resolution. The Scroll speed slider goes up to 300, since scrolling no longer speeds up with the resolution.Deployment: the core pack with this
OptionsMenu.wndandMainMenuVersion.wndneeds this code. Without the pack the retail options menu stays, the version stays in it, andsettings.jsonstill works.Tested:
z_generalsbuilds. Through the UI rig: the options menu inside the frame at 2560x1440, 1280x720 and 1024x768, the version on the main menu, options, skirmish and replay screens and gone in game, and a migration run (oldsettings.jsonto the new shapes,Options.inigainedScrollFactor).