Skip to content

Commit 41a1337

Browse files
electricbrasselectricbrass
committed
Merge branch 'stable' into flatpak
2 parents bb6ad11 + fa0ec2c commit 41a1337

File tree

586 files changed

+46527
-12746
lines changed

Some content is hidden

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

586 files changed

+46527
-12746
lines changed

‎.clang-format

+3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
---
22
BasedOnStyle: Microsoft
3+
AccessModifierOffset: -4
34
AlignEscapedNewlines: Left
45
AllowShortFunctionsOnASingleLine: Inline
56
AlwaysBreakTemplateDeclarations: Yes
67
ColumnLimit: 90
78
IndentWidth: 4
9+
InsertNewlineAtEOF: true
810
PointerAlignment: Left
11+
SortIncludes: Never
912
SpaceInEmptyBlock: true
1013
UseTab: ForIndentation

‎.github/workflows/linux.yml

+24-8
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,24 @@ jobs:
7070
run: bash ci/ubuntu-buildgen.sh
7171
- name: Run build
7272
run: cmake --build ./build/
73-
build-centos:
74-
name: Build (CentOS 7)
73+
build-arm:
74+
name: Build (ARM64)
75+
needs: pre_job
76+
if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
77+
runs-on: ubuntu-24.04-arm
78+
steps:
79+
- name: Checkout source
80+
uses: actions/checkout@v4
81+
- name: Checkout submodules
82+
run: git submodule update --init --recursive
83+
- name: Prepare build
84+
run: bash ci/ubuntu-buildgen.sh
85+
- name: Turn on problem matcher
86+
uses: ammaraskar/gcc-problem-matcher@master
87+
- name: Run build
88+
run: cmake --build ./build/
89+
build-fedora:
90+
name: Build (Fedora 32)
7591
needs: pre_job
7692
if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
7793
runs-on: ubuntu-latest
@@ -81,9 +97,9 @@ jobs:
8197
- name: Checkout submodules
8298
run: git submodule update --init --recursive
8399
- name: Run build
84-
run: bash ci/centos-buildgen.sh
85-
build-ubuntu-bionic:
86-
name: Build (Ubuntu 18.04 LTS)
100+
run: bash ci/fedora-buildgen.sh
101+
build-ubuntu-focal:
102+
name: Build (Ubuntu 20.04 LTS)
87103
needs: pre_job
88104
if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
89105
runs-on: ubuntu-latest
@@ -93,15 +109,15 @@ jobs:
93109
- name: Checkout submodules
94110
run: git submodule update --init --recursive
95111
- name: Run build
96-
run: bash ci/ubuntu-bionic-buildgen.sh
112+
run: bash ci/ubuntu-focal-buildgen.sh
97113
build-flatpak:
98114
name: Build Flatpak (Ubuntu Latest)
99115
needs: pre_job
100116
if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
101117
runs-on: ubuntu-latest
102118
steps:
103119
- name: Checkout source
104-
uses: actions/checkout@v2
120+
uses: actions/checkout@v4
105121
- name: Checkout submodules
106122
run: git submodule update --init --recursive
107123
- name: Install flatpak
@@ -123,7 +139,7 @@ jobs:
123139
flatpak build-bundle repo odamex.flatpak net.odamex.Odamex ${{ env.MODIFIED_BRANCH_NAME }} \
124140
--runtime-repo=https://flathub.org/repo/flathub.flatpakrepo
125141
- name: Upload artifact
126-
uses: actions/upload-artifact@v2
142+
uses: actions/upload-artifact@v4
127143
with:
128144
name: Flatpak
129145
path: odamex.flatpak

‎.github/workflows/windows-rc.yml

+12-50
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
name: Build Preparation
1111
runs-on: ubuntu-latest
1212
outputs:
13-
build_number: ${{ steps.gitversion.outputs.buildMetaData }}
13+
build_number: ${{ steps.revlist.outputs.totalCommits }}
1414
new_version: ${{ steps.gitversion.outputs.majorMinorPatch }}
1515
major: ${{ steps.gitversion.outputs.major }}
1616
minor: ${{ steps.gitversion.outputs.minor }}
@@ -27,9 +27,12 @@ jobs:
2727
- name: Determine Version
2828
id: gitversion
2929
uses: gittools/actions/gitversion/[email protected]
30-
- name: Get branch name
31-
id: branchname
32-
uses: nelonoel/[email protected]
30+
- name: Get Commits From Source
31+
id: revlist
32+
shell: pwsh
33+
run: |
34+
$commits = git rev-list HEAD --count
35+
Write-Output "::set-output name=totalCommits::$commits"
3336
- name: Display GitVersion outputs
3437
run: |
3538
echo "Major: ${{ steps.gitversion.outputs.major }}"
@@ -64,6 +67,7 @@ jobs:
6467
echo "CommitsSinceVersionSourcePadded: ${{ steps.gitversion.outputs.commitsSinceVersionSourcePadded }}"
6568
echo "UncommittedChanges: ${{ steps.gitversion.outputs.uncommittedChanges }}"
6669
echo "CommitDate: ${{ steps.gitversion.outputs.commitDate }}"
70+
echo "TotalCommits: ${{ steps.revlist.outputs.totalCommits }}"
6771
build:
6872
name: Build (Visual Studio)
6973
needs: pre_job
@@ -73,6 +77,8 @@ jobs:
7377
new_version: ${{ needs.pre_job.outputs.new_version }}
7478
steps:
7579
- uses: actions/checkout@v4
80+
with:
81+
fetch-depth: 0 # Required due to the way Git works, without it this action won't be able to find any or the correct tags
7682
- name: Run Upversion
7783
id: upversion
7884
shell: pwsh
@@ -84,14 +90,8 @@ jobs:
8490
PATCHVERSION: ${{ needs.pre_job.outputs.patch }}
8591
- name: Checkout submodules
8692
run: git submodule update --init --recursive
87-
- name: Remove .git folders
88-
shell: bash
89-
run: rm -rf .git
9093
- name: Turn on problem matcher
9194
uses: ammaraskar/msvc-problem-matcher@master
92-
- name: Remove .git folders
93-
shell: bash
94-
run: rm -rf .git
9595
- name: Run build powershell
9696
shell: pwsh
9797
run: |
@@ -126,6 +126,8 @@ jobs:
126126
new_version: ${{ needs.pre_job.outputs.new_version }}
127127
steps:
128128
- uses: actions/checkout@v4
129+
with:
130+
fetch-depth: 0 # Required due to the way Git works, without it this action won't be able to find any or the correct tags
129131
- name: Run Upversion
130132
id: upversion
131133
shell: pwsh
@@ -137,14 +139,8 @@ jobs:
137139
PATCHVERSION: ${{ needs.pre_job.outputs.patch }}
138140
- name: Checkout submodules
139141
run: git submodule update --init --recursive
140-
- name: Remove .git folders
141-
shell: bash
142-
run: rm -rf .git
143142
- name: Turn on problem matcher
144143
uses: ammaraskar/msvc-problem-matcher@master
145-
- name: Remove .git folders
146-
shell: bash
147-
run: rm -rf .git
148144
- name: Run build-x32 powershell
149145
shell: pwsh
150146
run: |
@@ -190,25 +186,6 @@ jobs:
190186
PATCHVERSION: ${{ needs.pre_job.outputs.patch }}
191187
- name: Checkout submodules
192188
run: git submodule update --init --recursive
193-
- name: Remove .git folders
194-
shell: bash
195-
run: rm -rf .git
196-
- name: Create tar.gz
197-
shell: bash
198-
run: |
199-
touch odamex-src-${{ env.new_version }}.tar.gz
200-
tar --transform 's,^,odamex-src-${{ env.new_version }}/,' --exclude='*.zip' --exclude='*.tar.gz' --exclude='*.tar.xz' --exclude-vcs -czvf odamex-src-${{ env.new_version }}.tar.gz **
201-
- name: Create tar.xz
202-
shell: bash
203-
run: |
204-
touch odamex-src-${{ env.new_version }}.tar.xz
205-
tar --transform 's,^,odamex-src-${{ env.new_version }}/,' --exclude='*.zip' --exclude='*.tar.gz' --exclude='*.tar.xz' --exclude-vcs -cJvf odamex-src-${{ env.new_version }}.tar.xz **
206-
- name: Create zip
207-
shell: pwsh
208-
run: |
209-
Copy-Item -Recurse -Force -Path "." -Destination "..\odamex-src-${{ env.new_version }}" -Exclude "*.zip","*.tar.gz","*.tar.xz"
210-
Remove-Item -Path "..\odamex-src-${{ env.new_version }}\.git*" -Recurse -Force
211-
Compress-Archive -Path "..\odamex-src-${{ env.new_version }}" -DestinationPath "odamex-src-${{ env.new_version }}.zip"
212189
- name: Download x86 artifacts
213190
uses: actions/download-artifact@v4
214191
with:
@@ -226,21 +203,6 @@ jobs:
226203
with:
227204
name: Odamex-Installer
228205
path: 'Output/*.exe'
229-
- name: Upload tar.xz
230-
uses: actions/upload-artifact@v4
231-
with:
232-
name: Odamex-tar-xz
233-
path: './*.tar.xz'
234-
- name: Upload tar.gz
235-
uses: actions/upload-artifact@v4
236-
with:
237-
name: Odamex-tar-gz
238-
path: './*.tar.gz'
239-
- name: Upload zip
240-
uses: actions/upload-artifact@v4
241-
with:
242-
name: Odamex-src-zip
243-
path: './odamex-src-${{ env.new_version }}.zip'
244206
# build-mingw:
245207
# name: Build (MinGW)
246208
# runs-on: windows-latest

‎.github/workflows/windows-release.yml

-3
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ jobs:
3333
- name: Determine Version
3434
id: gitversion
3535
uses: gittools/actions/gitversion/[email protected]
36-
- name: Get branch name
37-
id: branchname
38-
uses: nelonoel/[email protected]
3936
- name: Display GitVersion outputs
4037
run: |
4138
echo "Major: ${{ steps.gitversion.outputs.major }}"

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@ CMakeSettings.json
1010
# Used when generating the installer.
1111
/installer/windows/Build*/
1212
/installer/windows/Out*/
13+
14+
# Generated by fmtlib when building with VS
15+
/libraries/fmt/run-msbuild.bat

‎CMakeLists.txt

+8-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
cmake_minimum_required(VERSION 3.13)
1616

17-
project(Odamex VERSION 10.6.0)
17+
project(Odamex VERSION 11.0.0)
1818

1919
include(CMakeDependentOption)
2020

@@ -61,8 +61,13 @@ if(NOT APPLE AND NOT WIN32)
6161
add_definitions(-DODAMEX_INSTALL_DATADIR="${ODAMEX_INSTALL_DATADIR}")
6262
endif()
6363

64-
set(PROJECT_COPYRIGHT "2006-2024")
65-
set(PROJECT_RC_VERSION "10,6,0,0")
64+
if(NOT APPLE AND NOT WIN32)
65+
add_definitions(-DODAMEX_INSTALL_BINDIR="${ODAMEX_INSTALL_BINDIR}")
66+
add_definitions(-DODAMEX_INSTALL_DATADIR="${ODAMEX_INSTALL_DATADIR}")
67+
endif()
68+
69+
set(PROJECT_COPYRIGHT "2006-2025")
70+
set(PROJECT_RC_VERSION "11,0,0,0")
6671
set(PROJECT_COMPANY "The Odamex Team")
6772

6873
# Include early required commands for specific systems

‎README

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
===============================================================================
2-
Odamex v10.6.0 README
2+
Odamex v11.0.0 README
33
https://odamex.net
44
===============================================================================
55

‎Xbox/README.Xbox

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
===============================================================================
2-
Odamex v10.6.0 for Xbox
2+
Odamex v11.0.0 for Xbox
33
http://odamex.net/
44
Authored by:
55
Michael "Hyper_Eye" Wood

‎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

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>10.6.0</string>
22+
<string>11.0.0</string>
2323
<key>CFBundleShortVersionString</key>
24-
<string>10.6.0</string>
24+
<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>
28-
<string>10.6.0</string>
28+
<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

0 commit comments

Comments
 (0)