Skip to content

feat(online): Add a Network options section and keep scroll speed in Options.ini - #655

Draft
tintinhamans wants to merge 24 commits into
GeneralsOnlineDevelopmentTeam:mainfrom
tintinhamans:arctic/go/feat/network-options-menu
Draft

tintinhamans wants to merge 24 commits into
GeneralsOnlineDevelopmentTeam:mainfrom
tintinhamans:arctic/go/feat/network-options-menu

Conversation

@tintinhamans

@tintinhamans tintinhamans commented Oct 24, 2026 •

Copy link
Copy Markdown

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_overlay is removed. camera.move_speed_ratio is removed and migrated into ScrollFactor in Options.ini as old * 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.wnd and MainMenuVersion.wnd needs this code. Without the pack the retail options menu stays, the version stays in it, and settings.json still works.

Tested: z_generals builds. 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 (old settings.json to the new shapes, Options.ini gained ScrollFactor).

@tintinhamans
tintinhamans force-pushed the arctic/go/feat/network-options-menu branch 2 times, most recently from e9b3142 to fcd3e33 Compare October 25, 2026 02:38
@tintinhamans
tintinhamans force-pushed the arctic/go/feat/network-options-menu branch 2 times, most recently from 4002010 to 9198a6b Compare October 25, 2026 11:15
@tintinhamans tintinhamans changed the title feat(online): Show the connection settings in a Network section of the options menu feat(online): Show the connection settings in the options menu and keep scroll speed and FPS limit in Options.ini Oct 25, 2026
@tintinhamans
tintinhamans force-pushed the arctic/go/feat/network-options-menu branch 2 times, most recently from 78c4077 to 116f34e Compare October 26, 2026 15:39
tintinhamans and others added 16 commits October 27, 2026 14:32
@tintinhamans
tintinhamans force-pushed the arctic/go/feat/network-options-menu branch from 116f34e to eff2278 Compare October 28, 2026 01:47
@tintinhamans
tintinhamans force-pushed the arctic/go/feat/network-options-menu branch from eff2278 to 5000b87 Compare October 28, 2026 19:15
@tintinhamans tintinhamans changed the title feat(online): Show the connection settings in the options menu and keep scroll speed and FPS limit in Options.ini feat(online): Add a Network options section and keep scroll speed in Options.ini Oct 28, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants