Skip to content

Commit 040c83c

Browse files
electricbrasselectricbrass
authored
Merge branch 'stable' into patch-clipping
2 parents 14a059f + 0853509 commit 040c83c

File tree

480 files changed

+1567
-860
lines changed

Some content is hidden

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

480 files changed

+1567
-860
lines changed

‎.github/workflows/linux.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
- name: Run build
8888
run: cmake --build ./build/
8989
build-centos:
90-
name: Build (Fedora 28)
90+
name: Build (Fedora 32)
9191
needs: pre_job
9292
if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
9393
runs-on: ubuntu-latest
@@ -99,7 +99,7 @@ jobs:
9999
- name: Run build
100100
run: bash ci/fedora-buildgen.sh
101101
build-ubuntu-bionic:
102-
name: Build (Ubuntu 18.04 LTS)
102+
name: Build (Ubuntu 20.04 LTS)
103103
needs: pre_job
104104
if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
105105
runs-on: ubuntu-latest
@@ -109,4 +109,4 @@ jobs:
109109
- name: Checkout submodules
110110
run: git submodule update --init --recursive
111111
- name: Run build
112-
run: bash ci/ubuntu-bionic-buildgen.sh
112+
run: bash ci/ubuntu-focal-buildgen.sh

‎CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ cmake_dependent_option( ENABLE_PORTMIDI "Enable portmidi support" 1 BUILD_CLIENT
5454
cmake_dependent_option( USE_MINIUPNP "Build with UPnP support" 1 BUILD_SERVER 0 )
5555
cmake_dependent_option( USE_INTERNAL_MINIUPNP "Use internal MiniUPnP" 1 USE_MINIUPNP 0 )
5656

57-
set(PROJECT_COPYRIGHT "2006-2024")
57+
set(PROJECT_COPYRIGHT "2006-2025")
5858
set(PROJECT_RC_VERSION "11,0,0,0")
5959
set(PROJECT_COMPANY "The Odamex Team")
6060

‎Xbox/i_xbox.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//
44
// $Id$
55
//
6-
// Copyright (C) 2006-2020 by The Odamex Team.
6+
// Copyright (C) 2006-2025 by The Odamex Team.
77
//
88
// This program is free software; you can redistribute it and/or
99
// modify it under the terms of the GNU General Public License

‎Xbox/i_xbox.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//
44
// $Id$
55
//
6-
// Copyright (C) 2006-2020 by The Odamex Team.
6+
// Copyright (C) 2006-2025 by The Odamex Team.
77
//
88
// This program is free software; you can redistribute it and/or
99
// modify it under the terms of the GNU General Public License

‎ag-odalaunch/Xbox/xbox_api.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//
44
// $Id$
55
//
6-
// Copyright (C) 2006-2020 by The Odamex Team.
6+
// Copyright (C) 2006-2025 by The Odamex Team.
77
//
88
// This program is free software; you can redistribute it and/or
99
// modify it under the terms of the GNU General Public License

‎ag-odalaunch/Xbox/xbox_main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//
44
// $Id$
55
//
6-
// Copyright (C) 2006-2020 by The Odamex Team.
6+
// Copyright (C) 2006-2025 by The Odamex Team.
77
//
88
// This program is free software; you can redistribute it and/or
99
// modify it under the terms of the GNU General Public License

‎ag-odalaunch/Xbox/xbox_main.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//
44
// $Id$
55
//
6-
// Copyright (C) 2006-2020 by The Odamex Team.
6+
// Copyright (C) 2006-2025 by The Odamex Team.
77
//
88
// This program is free software; you can redistribute it and/or
99
// modify it under the terms of the GNU General Public License

‎ag-odalaunch/res/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
<key>CFBundleShortVersionString</key>
2424
<string>11.0.0</string>
2525
<key>CFBundleGetInfoString</key>
26-
<string>Copyright © 2006-2024 The Odamex Team</string>
26+
<string>Copyright © 2006-2025 The Odamex Team</string>
2727
<key>CFBundleLongVersionString</key>
2828
<string>11.0.0</string>
2929
<key>NSHumanReadableCopyright</key>
30-
<string>Copyright © 2006-2024 The Odamex Team</string>
30+
<string>Copyright © 2006-2025 The Odamex Team</string>
3131
<key>LSRequiresCarbon</key>
3232
<true/>
3333
</dict>

‎ag-odalaunch/src/agol_dirsel.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//
44
// $Id$
55
//
6-
// Copyright (C) 2006-2020 by The Odamex Team.
6+
// Copyright (C) 2006-2025 by The Odamex Team.
77
//
88
// This program is free software; you can redistribute it and/or
99
// modify it under the terms of the GNU General Public License

‎ag-odalaunch/src/agol_dirsel.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//
44
// $Id$
55
//
6-
// Copyright (C) 2006-2020 by The Odamex Team.
6+
// Copyright (C) 2006-2025 by The Odamex Team.
77
//
88
// This program is free software; you can redistribute it and/or
99
// modify it under the terms of the GNU General Public License

‎ag-odalaunch/src/agol_main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//
44
// $Id$
55
//
6-
// Copyright (C) 2006-2020 by The Odamex Team.
6+
// Copyright (C) 2006-2025 by The Odamex Team.
77
//
88
// This program is free software; you can redistribute it and/or
99
// modify it under the terms of the GNU General Public License

‎ag-odalaunch/src/agol_main.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//
44
// $Id$
55
//
6-
// Copyright (C) 2006-2020 by The Odamex Team.
6+
// Copyright (C) 2006-2025 by The Odamex Team.
77
//
88
// This program is free software; you can redistribute it and/or
99
// modify it under the terms of the GNU General Public License

‎ag-odalaunch/src/agol_manual.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//
44
// $Id$
55
//
6-
// Copyright (C) 2006-2020 by The Odamex Team.
6+
// Copyright (C) 2006-2025 by The Odamex Team.
77
//
88
// This program is free software; you can redistribute it and/or
99
// modify it under the terms of the GNU General Public License

‎ag-odalaunch/src/agol_manual.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//
44
// $Id$
55
//
6-
// Copyright (C) 2006-2020 by The Odamex Team.
6+
// Copyright (C) 2006-2025 by The Odamex Team.
77
//
88
// This program is free software; you can redistribute it and/or
99
// modify it under the terms of the GNU General Public License

‎ag-odalaunch/src/agol_settings.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//
44
// $Id$
55
//
6-
// Copyright (C) 2006-2020 by The Odamex Team.
6+
// Copyright (C) 2006-2025 by The Odamex Team.
77
//
88
// This program is free software; you can redistribute it and/or
99
// modify it under the terms of the GNU General Public License

‎ag-odalaunch/src/agol_settings.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//
44
// $Id$
55
//
6-
// Copyright (C) 2006-2020 by The Odamex Team.
6+
// Copyright (C) 2006-2025 by The Odamex Team.
77
//
88
// This program is free software; you can redistribute it and/or
99
// modify it under the terms of the GNU General Public License

‎ag-odalaunch/src/agol_solo.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//
44
// $Id$
55
//
6-
// Copyright (C) 2006-2020 by The Odamex Team.
6+
// Copyright (C) 2006-2025 by The Odamex Team.
77
//
88
// This program is free software; you can redistribute it and/or
99
// modify it under the terms of the GNU General Public License

‎ag-odalaunch/src/agol_solo.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//
44
// $Id$
55
//
6-
// Copyright (C) 2006-2020 by The Odamex Team.
6+
// Copyright (C) 2006-2025 by The Odamex Team.
77
//
88
// This program is free software; you can redistribute it and/or
99
// modify it under the terms of the GNU General Public License

‎ag-odalaunch/src/event_handler.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//
44
// $Id$
55
//
6-
// Copyright (C) 2006-2020 by The Odamex Team.
6+
// Copyright (C) 2006-2025 by The Odamex Team.
77
//
88
// This program is free software; you can redistribute it and/or
99
// modify it under the terms of the GNU General Public License

‎ag-odalaunch/src/event_handler.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//
44
// $Id$
55
//
6-
// Copyright (C) 2006-2020 by The Odamex Team.
6+
// Copyright (C) 2006-2025 by The Odamex Team.
77
//
88
// This program is free software; you can redistribute it and/or
99
// modify it under the terms of the GNU General Public License

‎ag-odalaunch/src/game_command.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//
44
// $Id$
55
//
6-
// Copyright (C) 2006-2020 by The Odamex Team.
6+
// Copyright (C) 2006-2025 by The Odamex Team.
77
//
88
// This program is free software; you can redistribute it and/or
99
// modify it under the terms of the GNU General Public License

‎ag-odalaunch/src/game_command.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//
44
// $Id$
55
//
6-
// Copyright (C) 2006-2020 by The Odamex Team.
6+
// Copyright (C) 2006-2025 by The Odamex Team.
77
//
88
// This program is free software; you can redistribute it and/or
99
// modify it under the terms of the GNU General Public License

‎ag-odalaunch/src/gui_config.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//
44
// $Id$
55
//
6-
// Copyright (C) 2006-2020 by The Odamex Team.
6+
// Copyright (C) 2006-2025 by The Odamex Team.
77
//
88
// This program is free software; you can redistribute it and/or
99
// modify it under the terms of the GNU General Public License

‎ag-odalaunch/src/gui_config.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//
44
// $Id$
55
//
6-
// Copyright (C) 2006-2020 by The Odamex Team.
6+
// Copyright (C) 2006-2025 by The Odamex Team.
77
//
88
// This program is free software; you can redistribute it and/or
99
// modify it under the terms of the GNU General Public License

‎ag-odalaunch/src/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//
44
// $Id$
55
//
6-
// Copyright (C) 2006-2020 by The Odamex Team.
6+
// Copyright (C) 2006-2025 by The Odamex Team.
77
//
88
// This program is free software; you can redistribute it and/or
99
// modify it under the terms of the GNU General Public License

‎ag-odalaunch/src/oda_thread.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//
44
// $Id$
55
//
6-
// Copyright (C) 2006-2020 by The Odamex Team.
6+
// Copyright (C) 2006-2025 by The Odamex Team.
77
//
88
// This program is free software; you can redistribute it and/or
99
// modify it under the terms of the GNU General Public License

‎ag-odalaunch/src/typedefs.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//
44
// $Id$
55
//
6-
// Copyright (C) 2006-2020 by The Odamex Team.
6+
// Copyright (C) 2006-2025 by The Odamex Team.
77
//
88
// This program is free software; you can redistribute it and/or
99
// modify it under the terms of the GNU General Public License

‎ci/fedora.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM fedora:28
1+
FROM fedora:32
22

33
WORKDIR odamex
44

‎ci/stage-inno-setup-and-run.ps1

+2-12
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,8 @@ function BuildOutCommon {
6666
-Destination "${CommonDir}"
6767
Copy-Item -Force -Path "${UnzippedX64}\licenses\COPYING.SDL2_mixer.txt" `
6868
-Destination "${CommonDir}\licenses"
69-
Copy-Item -Force -Path "${UnzippedX64}\licenses\LICENSE.FLAC.txt" `
70-
-Destination "${CommonDir}\licenses"
7169
Copy-Item -Force -Path "${UnzippedX64}\licenses\LICENSE.modplug.txt" `
7270
-Destination "${CommonDir}\licenses"
73-
Copy-Item -Force -Path "${UnzippedX64}\licenses\LICENSE.mpg123.txt" `
74-
-Destination "${CommonDir}\licenses"
7571
Copy-Item -Force -Path "${UnzippedX64}\licenses\LICENSE.ogg-vorbis.txt" `
7672
-Destination "${CommonDir}\licenses"
7773
Copy-Item -Force -Path "${UnzippedX64}\licenses\LICENSE.opus.txt" `
@@ -92,13 +88,10 @@ function BuildOutX86 {
9288
New-Item -Force -ItemType "directory" -Path "${OutX86}\redist"
9389

9490
Copy-Item -Force -Path `
95-
"${UnzippedX86}\libFLAC-8.dll", `
9691
"${UnzippedX86}\libmodplug-1.dll", `
97-
"${UnzippedX86}\libmpg123-0.dll", `
9892
"${UnzippedX86}\libogg-0.dll", `
9993
"${UnzippedX86}\libopus-0.dll", `
100-
"${UnzippedX86}\libvorbis-0.dll", `
101-
"${UnzippedX86}\libvorbisfile-3.dll", `
94+
"${UnzippedX86}\libopusfile-0.dll", `
10295
"${UnzippedX86}\odamex.exe", `
10396
"${UnzippedX86}\SDL2_mixer.dll", `
10497
"${UnzippedX86}\SDL2.dll", `
@@ -127,13 +120,10 @@ function BuildOutX64 {
127120
New-Item -Force -ItemType "directory" -Path "${OutX64}\redist"
128121

129122
Copy-Item -Force -Path `
130-
"${UnzippedX64}\libFLAC-8.dll", `
131123
"${UnzippedX64}\libmodplug-1.dll", `
132-
"${UnzippedX64}\libmpg123-0.dll", `
133124
"${UnzippedX64}\libogg-0.dll", `
134125
"${UnzippedX64}\libopus-0.dll", `
135-
"${UnzippedX64}\libvorbis-0.dll", `
136-
"${UnzippedX64}\libvorbisfile-3.dll", `
126+
"${UnzippedX64}\libopusfile-0.dll", `
137127
"${UnzippedX64}\odamex.exe", `
138128
"${UnzippedX64}\SDL2_mixer.dll", `
139129
"${UnzippedX64}\SDL2.dll", `

‎ci/ubuntu-bionic-buildgen.sh ‎ci/ubuntu-focal-buildgen.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ IFS=$'\n\t'
77

88
set -x
99

10-
docker build -t odamex -f ci/ubuntu-bionic.Dockerfile .
10+
docker build -t odamex -f ci/ubuntu-focal.Dockerfile .
1111
docker run --rm odamex

‎ci/ubuntu-bionic.Dockerfile ‎ci/ubuntu-focal.Dockerfile

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:20.04
22

33
WORKDIR odamex
44

55
COPY . .
66

7+
ENV TZ=US \
8+
DEBIAN_FRONTEND=noninteractive
9+
710
# Packages - first the majority of them, then cmake
811
RUN set -x && \
912
apt update && \
10-
apt install -y ninja-build libsdl2-dev libsdl2-mixer-dev \
13+
apt install -y g++ ninja-build libsdl2-dev libsdl2-mixer-dev \
1114
libpng-dev libcurl4-openssl-dev libwxgtk3.0-gtk3-dev deutex \
1215
apt-transport-https ca-certificates gnupg software-properties-common wget && \
1316
wget -O - 'https://apt.kitware.com/keys/kitware-archive-latest.asc' 2>/dev/null | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null && \
14-
apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main' && \
17+
apt-add-repository 'deb https://apt.kitware.com/ubuntu/ focal main' && \
1518
apt update && apt install -y cmake
1619

1720
WORKDIR build

‎ci/upload-b2.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env python3
22

33
#
4-
# Copyright (C) 2006-2020 by The Odamex Team.
4+
# Copyright (C) 2006-2025 by The Odamex Team.
55
#
66
# This program is free software; you can redistribute it and/or
77
# modify it under the terms of the GNU General Public License

‎ci/win-release-x64.ps1

+6-13
Original file line numberDiff line numberDiff line change
@@ -95,19 +95,15 @@ function CopyFilesX64 {
9595
-Destination "${CommonDir}\README.txt"
9696
Copy-Item -Force -Path "${CurrentDir}\BuildX64\wad\odamex.wad" `
9797
-Destination "${CommonDir}"
98-
Copy-Item -Force -Path "${CurrentDir}\BuildX64\libraries\SDL2_mixer-2.0.4\COPYING.txt" `
98+
Copy-Item -Force -Path "${CurrentDir}\BuildX64\libraries\SDL2_mixer-2.6.2\LICENSE.txt" `
9999
-Destination "${CommonDir}\licenses\COPYING.SDL2_mixer.txt"
100-
Copy-Item -Force -Path "${CurrentDir}\BuildX64\libraries\SDL2_mixer-2.0.4\lib\x64\LICENSE.FLAC.txt" `
100+
Copy-Item -Force -Path "${CurrentDir}\BuildX64\libraries\SDL2_mixer-2.6.2\lib\x64\optional\LICENSE.modplug.txt" `
101101
-Destination "${CommonDir}\licenses"
102-
Copy-Item -Force -Path "${CurrentDir}\BuildX64\libraries\SDL2_mixer-2.0.4\lib\x64\LICENSE.modplug.txt" `
102+
Copy-Item -Force -Path "${CurrentDir}\BuildX64\libraries\SDL2_mixer-2.6.2\lib\x64\optional\LICENSE.ogg-vorbis.txt" `
103103
-Destination "${CommonDir}\licenses"
104-
Copy-Item -Force -Path "${CurrentDir}\BuildX64\libraries\SDL2_mixer-2.0.4\lib\x64\LICENSE.mpg123.txt" `
104+
Copy-Item -Force -Path "${CurrentDir}\BuildX64\libraries\SDL2_mixer-2.6.2\lib\x64\optional\LICENSE.opus.txt" `
105105
-Destination "${CommonDir}\licenses"
106-
Copy-Item -Force -Path "${CurrentDir}\BuildX64\libraries\SDL2_mixer-2.0.4\lib\x64\LICENSE.ogg-vorbis.txt" `
107-
-Destination "${CommonDir}\licenses"
108-
Copy-Item -Force -Path "${CurrentDir}\BuildX64\libraries\SDL2_mixer-2.0.4\lib\x64\LICENSE.opus.txt" `
109-
-Destination "${CommonDir}\licenses"
110-
Copy-Item -Force -Path "${CurrentDir}\BuildX64\libraries\SDL2_mixer-2.0.4\lib\x64\LICENSE.opusfile.txt" `
106+
Copy-Item -Force -Path "${CurrentDir}\BuildX64\libraries\SDL2_mixer-2.6.2\lib\x64\optional\LICENSE.opusfile.txt" `
111107
-Destination "${CommonDir}\licenses"
112108
Copy-Item -Force -Path "${CurrentDir}\BuildX64\libraries\SDL2-2.0.20\COPYING.txt" `
113109
-Destination "${CommonDir}\licenses\COPYING.SDL2.txt"
@@ -120,13 +116,10 @@ function CopyFilesX64 {
120116
New-Item -Force -ItemType "directory" -Path "${X64Dir}\redist"
121117

122118
Copy-Item -Force -Path `
123-
"${CurrentDir}\BuildX64\client\RelWithDebInfo\libFLAC-8.dll", `
124119
"${CurrentDir}\BuildX64\client\RelWithDebInfo\libmodplug-1.dll", `
125-
"${CurrentDir}\BuildX64\client\RelWithDebInfo\libmpg123-0.dll", `
126120
"${CurrentDir}\BuildX64\client\RelWithDebInfo\libogg-0.dll", `
127121
"${CurrentDir}\BuildX64\client\RelWithDebInfo\libopus-0.dll", `
128-
"${CurrentDir}\BuildX64\client\RelWithDebInfo\libvorbis-0.dll", `
129-
"${CurrentDir}\BuildX64\client\RelWithDebInfo\libvorbisfile-3.dll", `
122+
"${CurrentDir}\BuildX64\client\RelWithDebInfo\libopusfile-0.dll", `
130123
"${CurrentDir}\BuildX64\client\RelWithDebInfo\odamex.exe", `
131124
"${CurrentDir}\BuildX64\client\RelWithDebInfo\SDL2_mixer.dll", `
132125
"${CurrentDir}\BuildX64\client\RelWithDebInfo\SDL2.dll", `

0 commit comments

Comments
 (0)