Skip to content

Codex/issue 69 localization fix #75

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

Merged
themuffinator merged 13 commits into from
Jun 18, 2026
Merged

Codex/issue 69 localization fix #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6b889e6
Preserve split-map campaign transition state
themuffinator Jun 18, 2026
e63472d
Match retail BSE sprite particle quads
themuffinator Jun 18, 2026
8aa64cd
Restore retail enemy-hit crosshair flash
themuffinator Jun 18, 2026
11116db
Add display-aware resolution selection
themuffinator Jun 18, 2026
3b47547
Fix brightness and gamma presentation on SDL backends
themuffinator Jun 18, 2026
58cd457
Fix non-English menu localization handling
themuffinator Jun 18, 2026
b8a15ba
Update lightgrid textures for maps
themuffinator Jun 18, 2026
da31e13
Add scope & display localization strings
themuffinator Jun 18, 2026
bb15c12
Add scope sensitivity strings to locales
themuffinator Jun 18, 2026
51c5e1f
Use branded Discord release avatar
themuffinator Jun 18, 2026
4f5364b
Restore Q4 sound-driven light amplitude
themuffinator Jun 18, 2026
116fca6
Restore aspect-agnostic machinegun scope blur
themuffinator Jun 18, 2026
3cb690d
Add scope sensitivity setting to Game options
themuffinator Jun 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/scripts/announce-release-discord.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const releaseEmoji = (process.env.DISCORD_RELEASE_EMOJI || "").trim();
const mentions = (process.env.DISCORD_RELEASE_MENTIONS || "").trim();
const feedbackChannel = (process.env.DISCORD_FEEDBACK_CHANNEL || "the openQ4 Discord").trim();
const avatarUrl = (process.env.DISCORD_RELEASE_AVATAR_URL ||
"https://raw.githubusercontent.com/themuffinator/OpenQ4/main/assets/icons/quake4_256.png").trim();
"https://raw.githubusercontent.com/themuffinator/OpenQ4/main/assets/img/avatar.png").trim();

function requireValue(value, name) {
if (!value) {
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/commit-validation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,11 @@ jobs:
shell: bash
run: |
set -euo pipefail
python -m py_compile tools/validation/openq4_validate.py tools/tests/renderer_validation_matrix.py tools/tests/linux_arm64_ci_coverage.py tools/tests/linux_highdpi_mouse.py tools/tests/linux_vsync_support.py tools/tests/loading_continue_input.py tools/tests/macos_renderer_startup_guard.py tools/tests/macos_metal_bridge.py tools/tests/posix_memory_management.py tools/tests/sdl3_input_parity.py tools/tests/sdl3_multidisplay_windowing.py tools/tests/steam_deck_support.py
python -m py_compile tools/validation/openq4_validate.py tools/tests/renderer_validation_matrix.py tools/tests/campaign_split_state_transition.py tools/tests/linux_arm64_ci_coverage.py tools/tests/linux_highdpi_mouse.py tools/tests/linux_vsync_support.py tools/tests/loading_continue_input.py tools/tests/macos_renderer_startup_guard.py tools/tests/macos_metal_bridge.py tools/tests/posix_memory_management.py tools/tests/sdl3_input_parity.py tools/tests/sdl3_multidisplay_windowing.py tools/tests/steam_deck_support.py
bash -n tools/build/meson_setup.sh
bash -n tools/validation/validate_push.sh
bash -n tools/validation/validate_pr.sh
python tools/tests/campaign_split_state_transition.py
python tools/tests/hdr_postprocess_math.py
python tools/tests/linux_arm64_ci_coverage.py
python tools/tests/linux_highdpi_mouse.py
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/discord-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
DISCORD_RELEASE_EMOJI: ${{ vars.DISCORD_RELEASE_EMOJI || '' }}
DISCORD_RELEASE_MENTIONS: ${{ vars.DISCORD_RELEASE_MENTIONS || '' }}
DISCORD_FEEDBACK_CHANNEL: ${{ vars.DISCORD_FEEDBACK_CHANNEL || 'the openQ4 Discord' }}
DISCORD_RELEASE_AVATAR_URL: ${{ vars.DISCORD_RELEASE_AVATAR_URL || 'https://raw.githubusercontent.com/themuffinator/OpenQ4/main/assets/icons/quake4_256.png' }}
DISCORD_RELEASE_AVATAR_URL: ${{ vars.DISCORD_RELEASE_AVATAR_URL || 'https://raw.githubusercontent.com/themuffinator/OpenQ4/main/assets/img/avatar.png' }}
shell: bash
run: |
set -euo pipefail
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manual-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,7 +747,7 @@ jobs:
DISCORD_RELEASE_EMOJI: ${{ vars.DISCORD_RELEASE_EMOJI || '' }}
DISCORD_RELEASE_MENTIONS: ${{ vars.DISCORD_RELEASE_MENTIONS || '' }}
DISCORD_FEEDBACK_CHANNEL: ${{ vars.DISCORD_FEEDBACK_CHANNEL || 'the openQ4 Discord' }}
DISCORD_RELEASE_AVATAR_URL: ${{ vars.DISCORD_RELEASE_AVATAR_URL || 'https://raw.githubusercontent.com/themuffinator/OpenQ4/main/assets/icons/quake4_256.png' }}
DISCORD_RELEASE_AVATAR_URL: ${{ vars.DISCORD_RELEASE_AVATAR_URL || 'https://raw.githubusercontent.com/themuffinator/OpenQ4/main/assets/img/avatar.png' }}
shell: bash
run: |
set -euo pipefail
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/push-verification.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,11 @@ jobs:
shell: bash
run: |
set -euo pipefail
python -m py_compile tools/validation/openq4_validate.py tools/tests/renderer_validation_matrix.py tools/tests/linux_arm64_ci_coverage.py tools/tests/linux_highdpi_mouse.py tools/tests/linux_vsync_support.py tools/tests/loading_continue_input.py tools/tests/macos_renderer_startup_guard.py tools/tests/macos_metal_bridge.py tools/tests/posix_memory_management.py tools/tests/sdl3_input_parity.py tools/tests/sdl3_multidisplay_windowing.py tools/tests/steam_deck_support.py
python -m py_compile tools/validation/openq4_validate.py tools/tests/renderer_validation_matrix.py tools/tests/campaign_split_state_transition.py tools/tests/linux_arm64_ci_coverage.py tools/tests/linux_highdpi_mouse.py tools/tests/linux_vsync_support.py tools/tests/loading_continue_input.py tools/tests/macos_renderer_startup_guard.py tools/tests/macos_metal_bridge.py tools/tests/posix_memory_management.py tools/tests/sdl3_input_parity.py tools/tests/sdl3_multidisplay_windowing.py tools/tests/steam_deck_support.py
bash -n tools/build/meson_setup.sh
bash -n tools/validation/validate_push.sh
bash -n tools/validation/validate_pr.sh
python tools/tests/campaign_split_state_transition.py
python tools/tests/hdr_postprocess_math.py
python tools/tests/linux_arm64_ci_coverage.py
python tools/tests/linux_highdpi_mouse.py
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,4 @@ _tmp_*
/.home/
*.pdb
.voice_eng/
/$outDir
26 changes: 14 additions & 12 deletions .install/baseoq4/glprogs/glsl/sniperstretch2.glslfp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,18 @@ uniform sampler2D Scope;

varying vec2 scopeTexCoord;

uniform vec2 textureScale;
uniform vec2 textureHalfScale;
uniform vec4 backgroundColor;
uniform vec2 videoSize;
uniform vec2 currentRenderViewportOrigin;
uniform vec2 currentRenderViewportSize;
uniform vec2 currentRenderTextureScale;

void main(void)
{
vec2 safeVideoSize = max( videoSize, vec2( 1.0, 1.0 ) );
vec2 start = clamp( ( gl_FragCoord.xy / safeVideoSize ) * textureScale, vec2( 0.0, 0.0 ), textureScale );
vec2 blurDir = start - textureHalfScale;
vec2 safeViewportSize = max( currentRenderViewportSize, vec2( 1.0, 1.0 ) );
vec2 safeTextureScale = max( currentRenderTextureScale, vec2( 0.0, 0.0 ) );
vec2 viewportTexCoord = ( gl_FragCoord.xy - currentRenderViewportOrigin ) / safeViewportSize;
vec2 start = clamp( viewportTexCoord * safeTextureScale, vec2( 0.0, 0.0 ), safeTextureScale );
vec2 blurDir = start - ( safeTextureScale * 0.5 );
vec4 scopeArea = texture2D( Scope, scopeTexCoord );
vec4 blurColor = texture2D( BackgroundImage, start );

Expand All @@ -26,17 +28,17 @@ void main(void)
vec2 amount = blurDir * len * 0.25;
vec2 pos;

pos = clamp( start - amount * 1.5, vec2( 0.0, 0.0 ), textureScale );
pos = clamp( start - amount * 1.5, vec2( 0.0, 0.0 ), safeTextureScale );
colors[0] = texture2D( BackgroundImage, pos );
pos = clamp( start - amount * 1.4, vec2( 0.0, 0.0 ), textureScale );
pos = clamp( start - amount * 1.4, vec2( 0.0, 0.0 ), safeTextureScale );
colors[1] = texture2D( BackgroundImage, pos );
pos = clamp( start - amount * 1.3, vec2( 0.0, 0.0 ), textureScale );
pos = clamp( start - amount * 1.3, vec2( 0.0, 0.0 ), safeTextureScale );
colors[2] = texture2D( BackgroundImage, pos );
pos = clamp( start - amount * 1.2, vec2( 0.0, 0.0 ), textureScale );
pos = clamp( start - amount * 1.2, vec2( 0.0, 0.0 ), safeTextureScale );
colors[3] = texture2D( BackgroundImage, pos );
pos = clamp( start - amount * 1.1, vec2( 0.0, 0.0 ), textureScale );
pos = clamp( start - amount * 1.1, vec2( 0.0, 0.0 ), safeTextureScale );
colors[4] = texture2D( BackgroundImage, pos );
pos = clamp( start - amount * 1.0, vec2( 0.0, 0.0 ), textureScale );
pos = clamp( start - amount * 1.0, vec2( 0.0, 0.0 ), safeTextureScale );
colors[5] = texture2D( BackgroundImage, pos );

blurColor = ( colors[0] + colors[1] + colors[2] + colors[3] + colors[4] + colors[5] ) / 6.0;
Expand Down
7 changes: 7 additions & 0 deletions .install/baseoq4/guis/mainmenu.gui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16382,6 +16382,8 @@ windowDef Desktop
set "set_game_autoswitch_hover::visible" "1";
set "set_game_togglezoom::visible" "1" ;
set "set_game_togglezoom_hover::visible" "1" ;
set "set_game_scopesensitivity::visible" "1" ;
set "set_game_scopesensitivity_hover::visible" "1" ;
set "set_game_showdecals::visible" "1" ;
set "set_game_showdecals_hover::visible" "1" ;
set "set_game_showgun::visible" "1" ;
Expand Down Expand Up @@ -16491,6 +16493,7 @@ windowDef Desktop
set "set_game_autoreload::noevents" "0" ;
set "set_game_autoswitch::noevents" "0" ;
set "set_game_togglezoom::noevents" "0" ;
set "set_game_scopesensitivity::noevents" "0" ;
set "set_game_showdecals::noevents" "0" ;
set "set_game_showgun::noevents" "0" ;
set "set_game_gunXYZ::noevents" "0" ;
Expand Down Expand Up @@ -16550,6 +16553,8 @@ windowDef Desktop
set "set_game_autoswitch_hover::visible" "0" ;
set "set_game_togglezoom::visible" "0" ;
set "set_game_togglezoom_hover::visible" "0" ;
set "set_game_scopesensitivity::visible" "0" ;
set "set_game_scopesensitivity_hover::visible" "0" ;
set "set_game_showdecals::visible" "0" ;
set "set_game_showdecals_hover::visible" "0" ;
set "set_game_showgun::visible" "0" ;
Expand Down Expand Up @@ -16645,6 +16650,7 @@ windowDef Desktop
set "set_game_autoreload::noevents" "1" ;
set "set_game_autoswitch::noevents" "1" ;
set "set_game_togglezoom::noevents" "1" ;
set "set_game_scopesensitivity::noevents" "1" ;
set "set_game_showdecals::noevents" "1" ;
set "set_game_showgun::noevents" "1" ;
set "set_game_gunXYZ::noevents" "1" ;
Expand Down Expand Up @@ -18564,6 +18570,7 @@ windowDef Desktop
set "set_game_autoreload_background::matcolor_w" "0.4" ;
set "set_game_autoswitch_background::matcolor_w" "0.4" ;
set "set_game_togglezoom_background::matcolor_w" "0.4" ;
set "set_game_scopesensitivity_background::matcolor_w" "0.4" ;
set "set_game_showdecals_background::matcolor_w" "0.4" ;
set "set_game_showgun_background::matcolor_w" "0.4" ;
set "set_game_gunXYZ_background::matcolor_w" "0.4" ;
Expand Down
Loading
Loading