v1.3.8 Release

.ci/i686-w64-mingw32.txt

@@ -4,6 +4,7 @@ cpp = 'i686-w64-mingw32-g++'
 ar = 'i686-w64-mingw32-ar'
 strip = 'i686-w64-mingw32-strip'
 windres = 'i686-w64-mingw32-windres'
+nasm = 'nasm'
 
 [host_machine]
 system = 'windows'

.ci/x86_64-w64-mingw32.txt

@@ -4,6 +4,7 @@ cpp = 'x86_64-w64-mingw32-g++'
 ar = 'x86_64-w64-mingw32-ar'
 strip = 'x86_64-w64-mingw32-strip'
 windres = 'x86_64-w64-mingw32-windres'
+nasm = 'nasm'
 
 [host_machine]
 system = 'windows'

.github/workflows/build.yml

@@ -2,9 +2,9 @@ name: build
 
 on:
   push:
-    branches: [master, aqtion, alpha-aqtion, ci]
+    branches: [master, aqtion, aqtion-alpha, ci]
   pull_request:
-    branches: [master, aqtion, alpha-aqtion]
+    branches: [master, aqtion, aqtion-alpha]
   workflow_dispatch:
 
 env:
@@ -19,14 +19,10 @@ env:
     -Dvariable-fps=true
     -Dwerror=false
     -Daqtion-build=true
-    -Ddiscord-sdk=true
-    -Davcodec=disabled 
-# Disabled avcodec for now, because AQtion doesn't use it, but it's there if we do cinematics one day
+    -Ddiscord-sdk=false
 
   MESON_ARGS_WIN: >-
-    -Dlibpng:werror=false
     -Dsdl2=disabled
-    -Dvorbis:werror=false
     -Dwayland=disabled
     -Dwrap_mode=forcefallback
     -Dx11=disabled
@@ -55,17 +51,18 @@ jobs:
         #arch: ["i686", "x86_64"]
         arch: ["x86_64"]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: subprojects/packagecache
           key: ${{ hashFiles('subprojects/*.wrap') }}
 
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y gcc-mingw-w64 meson nasm uuid-dev
+          sudo apt-get install -y gcc-mingw-w64 nasm python3-pip ninja-build
+          sudo python3 -m pip install meson
 
       - name: Build
         run: |
@@ -74,7 +71,7 @@ jobs:
           meson compile -vC builddir
 
       - name: Generate Win Mingw archives
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: q2pro-mingw-${{ matrix.arch }}
           path: |
@@ -89,9 +86,9 @@ jobs:
         #arch: ["x86", "x64"]
         arch: ["x64"]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: subprojects/packagecache
           key: ${{ hashFiles('subprojects/*.wrap') }}
@@ -111,7 +108,7 @@ jobs:
           meson compile -C builddir
 
       - name: Generate Win MSVC archives
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: q2pro-msvc-${{ matrix.arch }}
           path: |
@@ -126,15 +123,17 @@ jobs:
       matrix:
         cc: [gcc, clang]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install dependencies
         run: |
           sudo apt-get update
           sudo apt-get install -y python3 python3-pip libsdl2-dev libopenal-dev \
           libpng-dev libjpeg-dev zlib1g-dev mesa-common-dev \
           libcurl4-openssl-dev libx11-dev libxi-dev \
-          libogg-dev libvorbis-dev uuid-dev patchelf
+          libavcodec-dev libavformat-dev libavutil-dev \
+          libswresample-dev libswscale-dev \
+          uuid-dev patchelf
           pip3 install meson ninja
 
       - name: Build
@@ -153,7 +152,7 @@ jobs:
           chmod +x builddir/q2pro*
 
       - name: Generate Linux x64 archives
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: q2pro-lin-${{ matrix.cc }}
           path: |
@@ -168,7 +167,7 @@ jobs:
       matrix:
         cc: [gcc, clang]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install dependencies
         run: |
@@ -177,7 +176,9 @@ jobs:
           libpng-dev libjpeg-dev zlib1g-dev mesa-common-dev \
           libcurl4-openssl-dev libx11-dev libxi-dev \
           libwayland-dev wayland-protocols libdecor-0-dev \
-          libogg-dev libvorbis-dev uuid-dev patchelf
+          libavcodec-dev libavformat-dev libavutil-dev \
+          libswresample-dev libswscale-dev \
+          uuid-dev patchelf
 
       - name: Build
         run: |
@@ -195,7 +196,7 @@ jobs:
           chmod +x builddir/q2pro*
 
       - name: Generate Linux x64 archives
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: q2pro-lin-wayland-${{ matrix.cc }}
           path: |
@@ -209,7 +210,7 @@ jobs:
       matrix:
         cc: [gcc]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       # - name: Install dependencies
       #   run: |
@@ -222,7 +223,7 @@ jobs:
 
       - name: Build
         run: |
-          meson setup ${{ env.MESON_ARGS }} ${{ env.MESON_ARGS_LINUX }} builddir
+          meson setup ${{ env.MESON_ARGS }} ${{ env.MESON_ARGS_LINUX_X11 }} builddir
           meson compile -vC builddir
         env:
           CC: ${{ matrix.cc }}
@@ -232,7 +233,7 @@ jobs:
           chmod +x builddir/q2pro*
 
       - name: Generate Linux ARM archives
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: q2pro-lin-arm64
           path: |
@@ -241,16 +242,13 @@ jobs:
             builddir/gamearm.so
 
   darwin:
-    runs-on: macos-latest
-    strategy:
-      matrix:
-        arch: [x86_64]
+    runs-on: macos-13
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Install dependencies
         run: |
-          brew install pkg-config meson libpng sdl2 openal-soft zlib curl libvorbis jpeg-turbo
+          brew install pkg-config meson libpng sdl2 openal-soft zlib curl ffmpeg jpeg-turbo
 
       - name: Build
         run: |
@@ -266,41 +264,41 @@ jobs:
           chmod +x builddir/q2pro*
 
       - name: Generate Mac archives
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: q2pro-darwin-${{ matrix.arch }}
+          name: q2pro-darwin-x86_64
           path: |
             builddir/q2pro
             builddir/q2proded
             builddir/gamex86_64.dylib
 
-  # Github does not support Apple Silicon yet
-  # macARM64:
-  #   runs-on: macos-latest
-  #   steps:
-  #     - uses: actions/checkout@v2
-
-  #     - name: Setup Homebrew for ARM64 and dependencies
-  #       run: |
-  #         arch -arm64 brew install meson libpng jpeg sdl2 openal-soft zlib curl libvorbis
-
-  #     - name: Build
-  #       run: |
-  #         meson setup ${{ env.MESON_ARGS }} builddir
-  #         ninja -vC builddir
-  #       env:
-  #         CC: "gcc"
-  #         PKG_CONFIG_PATH: "/opt/homebrew/Cellar/openal-soft/1.22.2/lib/pkgconfig/:/opt/homebrew/Cellar/jpeg/9e/lib/pkgconfig/"
-  #         CFLAGS: "-target arm64-apple-macos11"
-
-  #     - name: Set binaries as executable
-  #       run: |
-  #         chmod +x builddir/q2pro*
-
-  #     - name: Generate Mac archives
-  #       uses: actions/upload-artifact@v3
-  #       with:
-  #         name: q2pro-mac-arm64
-  #         path: |
-  #           builddir/q2pro
-  #           builddir/q2proded
+  darwin-arm64:
+    runs-on: macos-14
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: |
+          brew install pkg-config meson libpng sdl2 openal-soft zlib curl ffmpeg jpeg-turbo
+
+      - name: Build
+        run: |
+          meson setup ${{ env.MESON_ARGS }} ${{ env.MESON_ARGS_MAC }} builddir
+          meson compile -vC builddir
+        env:
+          CC: "gcc"
+          PKG_CONFIG_PATH: "/opt/homebrew/opt/openal-soft/lib/pkgconfig"
+          CFLAGS: "-target arm64-apple-macos11"
+
+      - name: Set binaries as executable
+        run: |
+          chmod +x builddir/q2pro*
+
+      - name: Generate Mac archives
+        uses: actions/upload-artifact@v4
+        with:
+          name: q2pro-darwin-arm64
+          path: |
+            builddir/q2pro
+            builddir/q2proded
+            builddir/gamex86_64.dylib

.github/workflows/release.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: actionquake/q2pro
           ref: ${{ github.ref }}
@@ -101,6 +101,13 @@ jobs:
           name: q2pro-darwin-x86_64
           skip_unpack: true
 
+      - name: Download Darwin arm64 build artifacts
+        uses: dawidd6/action-download-artifact@v2
+        with:
+          workflow: build.yml
+          name: q2pro-darwin-arm64
+          skip_unpack: true
+
       - name: Upload dist tarball to release
         uses: softprops/action-gh-release@v1
         env:
@@ -117,6 +124,7 @@ jobs:
             q2pro-lin-wayland-gcc.zip
             q2pro-lin-wayland-clang.zip
             q2pro-darwin-x86_64.zip
+            q2pro-darwin-arm64.zip
 
 
 

INSTALL.md

@@ -16,14 +16,18 @@ network protocol level. The rest of dependencies are optional.
 For JPEG support libjpeg-turbo is required, plain libjpeg will not work. Most
 Linux distributions already provide libjpeg-turbo in place of libjpeg.
 
+For playing back cinematics in Ogg Theora format and music in Ogg Vorbis format
+FFmpeg libraries are required.
+
 To install the *full* set of dependencies for building Q2PRO on Debian or
 Ubuntu use the following command:
 
     apt-get install meson gcc libc6-dev libsdl2-dev libopenal-dev \
                     libpng-dev libjpeg-dev zlib1g-dev mesa-common-dev \
                     libcurl4-gnutls-dev libx11-dev libxi-dev \
                     libwayland-dev wayland-protocols libdecor-0-dev \
-                    libogg-dev libvorbis-dev
+                    libavcodec-dev libavformat-dev libavutil-dev \
+                    libswresample-dev libswscale-dev
 
 Users of other distributions should look for equivalent development packages
 and install them.
@@ -85,8 +89,7 @@ Q2PRO supports playback of background music ripped off original CD in Ogg
 Vorbis format. Music files should be placed in `music` subdirectory of the game
 directory in format `music/trackNN.ogg`, where `NN` corresponds to CD track
 number. `NN` should be typically in range 02-11 (track 01 is data track on
-original CD and should never be used). Placing music in packfile will also
-work.
+original CD and should never be used).
 
 Note that so-called ‘GOG’ naming convention where music tracks are named
 ‘Track01’ to ‘Track21’ is not supported.

README.md

@@ -13,7 +13,9 @@ Features include:
 * recording from demos, forward and backward seeking
 * server side multiview demos and GTV capabilities
 
-For building Q2PRO, consult the INSTALL file.
+For building Q2PRO, consult the INSTALL.md file.
+
+Nightly Windows builds are available at https://skuller.net/q2pro/
 
 For information on using and configuring Q2PRO, refer to client and server
 manuals available in doc/ subdirectory.

doc/client.asciidoc

@@ -107,7 +107,10 @@ cl_gun::
 cl_footsteps::
     Controls footstep sounds. When using Q2PRO protocol, disabling this saves
     some bandwidth since the server stops sending footstep events at all.
-    Default value is 1 (enabled).
+    Default value is 1.
+      - 0 — footsteps disabled
+      - 1 — use custom footsteps per surface (if found)
+      - 2 — use default footstep sound
 
 cl_updaterate::
     Specifies the perferred update rate requested from Q2PRO servers. Only used
@@ -265,6 +268,9 @@ cl_gun_y::
 cl_gun_z::
     Specifies custom gun model offset. Default value is 0.
 
+cl_muzzleflashes::
+    Specifies if muzzleflash effects are enabled. Default value is 1.
+
 Sound Subsystem
 ~~~~~~~~~~~~~~~
 

inc/client/client.h

@@ -100,6 +100,8 @@ void Con_Close(bool force);
 
 void SCR_BeginLoadingPlaque(void);
 void SCR_EndLoadingPlaque(void);
+int SCR_CheckForCinematic(const char *name);
+
 void SCR_ModeChanged(void);
 void SCR_UpdateScreen(void);
 
@@ -150,5 +152,6 @@ float V_CalcFov(float fov_x, float width, float height);
 
 #define SCR_BeginLoadingPlaque()        (void)0
 #define SCR_EndLoadingPlaque()          (void)0
+#define SCR_CheckForCinematic(name)     Q_ERR_SUCCESS
 
 #endif // !USE_CLIENT

inc/client/sound/sound.h

@@ -38,9 +38,12 @@ void S_BeginRegistration(void);
 qhandle_t S_RegisterSound(const char *sample);
 void S_EndRegistration(void);
 
+#define MAX_RAW_SAMPLES     8192
+
 void S_RawSamples(int samples, int rate, int width, int channels, const byte *data);
+int S_GetSampleRate(void);
 
-#if USE_OGG
+#if USE_AVCODEC
 void OGG_Play(void);
 void OGG_Stop(void);
 void OGG_Update(void);