Skip to content

Commit f1c6be9

Browse files
electricbrasselectricbrass
authored
Merge branch 'stable' into fov-sp
2 parents a632cc6 + 0853509 commit f1c6be9

File tree

441 files changed

+448
-448
lines changed

Some content is hidden

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

441 files changed

+448
-448
lines changed

‎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/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

‎client/gui/gui_boot.cpp

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

‎client/gui/gui_boot.h

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

‎client/gui/gui_common.cpp

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

‎client/gui/gui_common.h

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

‎client/gui/gui_resource.h

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

‎client/sdl/i_icon.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

‎client/sdl/i_input.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

‎client/sdl/i_input.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

‎client/sdl/i_input_sdl12.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

‎client/sdl/i_input_sdl12.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

‎client/sdl/i_input_sdl20.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

‎client/sdl/i_input_sdl20.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

‎client/sdl/i_main.cpp

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

‎client/sdl/i_midi.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

‎client/sdl/i_midi.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

‎client/sdl/i_music.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)