Commit Graph

378 Commits

Author SHA1 Message Date
Louis Gombert
10832ff91d
Merge pull request #237 from winterheart/remove-ipx
Remove IPX/SPX protocol support from netcode
2024-05-01 11:31:45 +00:00
Azamat H. Hackimov
9abe6aca42 Replace some of sprintf() with snprintf()
Replaced some of sprintf() (deprecated on macOS) with more secure snprintf().
2024-05-01 06:27:50 -04:00
Azamat H. Hackimov
ae03b6fd02
Merge pull request #235 from Lgt2x/cmake-options
CMake: expose BUILD_TESTNG option, rename LOGGER to ENABLE_LOGGER
2024-05-01 02:02:02 +03:00
Jeod
7607593958
Merge branch 'main' into cmake-options 2024-04-30 17:57:58 -04:00
Azamat H. Hackimov
b063f40b1a
Merge pull request #207 from Nakhr11n/pstring-refactor
Refactor CleanupStr in misc/pstring.cpp
2024-05-01 00:45:03 +03:00
Louis Gombert
d3b0bb744b
Merge pull request #212 from bryanperris/new-log-system
Integrate spdlog logger system
2024-04-30 19:10:27 +00:00
Louis Gombert
0b41a1b963 CMake: expose BUILD_TESTNG option, rename LOGGER to ENABLE_LOGGER 2024-04-30 20:41:45 +02:00
bperris
27eadbf66b
Merge branch 'main' into new-log-system 2024-04-30 14:38:11 -04:00
Louis Gombert
3bdbdc196f
Merge pull request #204 from winterheart/split-debug-module-v2
Move debug functions to own module
2024-04-30 18:35:00 +00:00
Bryan Perris
b0e5754e96 Introduce spdlog logging system
* The game version is now printed via the log system rather than from within the loki_initialize function.
remove this line
2024-04-30 14:27:38 -04:00
Azamat H. Hackimov
ca83125abc Remove IPX/SPX protocol support from netcode
IPX/SPX stack is deprecated and has no support on modern systems.
2024-04-30 18:24:45 +00:00
Louis Gombert
0ff442cab3
Merge pull request #234 from Nakhr11n/asm
Remove asm files?
2024-04-30 18:23:34 +00:00
Jeod
6cc24238b3
Merge pull request #247 from icculus/ryan-more-x11-removal 2024-04-30 14:13:42 -04:00
Louis Gombert
c78213dbe4
Merge pull request #245 from icculus/ryan-minus-ryan
Remove renderer/dyna_gl_ryan.h
2024-04-30 18:08:54 +00:00
Ryan C. Gordon
f8a4cb3cc0
More X11 removal.
This is all unused stuff, just doing a more-complete purge.
2024-04-30 13:04:15 -04:00
Ryan C. Gordon
460f401924
Remove renderer/dyna_gl_ryan.h
This is unused code from back when Loki Software was working on the game.
2024-04-30 12:28:35 -04:00
Jeod
cfc8356436
Merge pull request #244 from icculus/ryan-x11-removal 2024-04-30 12:24:43 -04:00
Ryan C. Gordon
6a18afab7c
Remove references to X11 and glX.
This is all in unused/unnecessary/leftover code, but the code wouldn't
build without Xlib headers on the system, which was forcing the Mac builds
to install xquartz.

This also removes renderer/SoftwareOpenGL*, which was _not_ a
software-rendered OpenGL, but just an older version of the same code that's
in HardwareOpenGL.cpp--old enough to still talk to glX directly, which is
what caught my attention.
2024-04-30 12:08:03 -04:00
Jeod
95eacee7f3
Merge pull request #239 from winterheart/utf8-convert
Convert winmain.cpp to UTF-8
2024-04-29 20:03:17 -04:00
Jeod
9067cd8bd3
Merge branch 'main' into utf8-convert 2024-04-29 20:01:27 -04:00
Jeod
9062002921
Merge pull request #238 from DescentDevelopers/JeodC-patch-1
Make launcher optional
2024-04-29 20:00:21 -04:00
Azamat H. Hackimov
758ff973e1 Convert winmain.cpp to UTF-8
winmain.cpp has mixed encoding with various ISO codepages.
2024-04-30 02:55:31 +03:00
Azamat H. Hackimov
665539dfa6 Move debug functions to own module
This commit is part of efforts to isolate subsystems of project into own modules.
2024-04-30 02:19:20 +03:00
Jeod
358fb091d3
Update winmain.cpp 2024-04-29 18:35:25 -04:00
Jeod
90383930ed
Update winmain.cpp 2024-04-29 18:15:08 -04:00
Azamat H. Hackimov
2aece028d0 Move debug functions to own module
This commit is part of efforts to isolate subsystems of project into own modules.
2024-04-30 00:58:34 +03:00
Oskar Strengbohm
ee12e3a5dd misc: pstring: Improve CleanupStr. 2024-04-29 22:11:57 +02:00
Oskar Strengbohm
21afcaafa0 Remove asm files. 2024-04-29 21:44:32 +02:00
Azamat H. Hackimov
b0cef3ff0e
Merge pull request #197 from Nakhr11n/pstring
Refactor and remove unnecessary in misc/pstring.cpp and dependents.
2024-04-29 22:23:48 +03:00
Louis Gombert
c9d59b9073
Merge pull request #219 from MaddTheSane/virtualDestructor
Add virtual default destructors on a few abstract classes.
2024-04-29 18:36:42 +00:00
C.W. Betts
61e9a42a73 Add virtual default destructors on a few abstract classes. 2024-04-29 15:28:30 +00:00
Oskar Strengbohm
4582b44eb3 misc: pstring: Refactor dependents. 2024-04-29 10:01:33 +02:00
Oskar Strengbohm
f9fdfc22e8 misc: pstring: Remove unneccesary or unused functions. 2024-04-29 09:55:45 +02:00
Jeod
aa7407a8d5
Merge pull request #218 from icculus/ryan-compiler-warnings 2024-04-29 03:27:14 -04:00
Ryan C. Gordon
6c8977caf0
Heavy patching for compiler warnings.
The vast majority of this is fixing up `char *` that should be `const char *`
but a handful of other fixes, like potential buffer overflows that GCC
noticed, etc, were applied as well.

This removes `-Wno-write-strings` from CMakeLists.txt, as it is no longer
necessary, as there is no longer a flood of compiler warning spam when
building.

This does not fix all compiler warnings; there are still a handful, and they
are legitimate, but they can be dealt with in a future commit.
2024-04-29 00:18:56 -04:00
bperris
9d2aa8d809
Merge pull request #227 from th1000s/mp
Windows/CMake: add /MP for multi process MSBuild
2024-04-28 19:39:53 -04:00
Thomas Otto
19fb21434c Windows/CMake: add /MP for multi process MSBuild
"The /MP option can reduce the total time to compile the source
files on the command line. The /MP option causes the compiler
to create one or more copies of itself, each in a separate process."

<https://learn.microsoft.com/en-us/cpp/build/reference/mp-build-with-multiple-processes?view=msvc-170>
2024-04-29 01:11:57 +02:00
Jeod
20046a5b8b
Merge pull request #225 from winterheart/win32-linker-fix
Enable WIN32 property only for Descent3
2024-04-28 18:47:49 -04:00
Azamat H. Hackimov
c18be49ae6 Enable WIN32 property only for Descent3
Disable global linker option that forces /SUBSYSTEM:WINDOWS for all executables (tools and unittest included).
2024-04-29 01:43:06 +03:00
Louis Gombert
9b5f8cbee2
Merge pull request #199 from th1000s/cmdline
Unify Windows/Unix command line
2024-04-28 22:14:03 +00:00
Louis Gombert
6d91c381f8
Merge pull request #179 from winterheart/checksum-unittests
Checksum unittests and Osiris types unification
2024-04-28 21:54:34 +00:00
Louis Gombert
38f75ee9a8
Merge pull request #171 from winterheart/ci-unittests
Enable unittests on CI
2024-04-28 21:09:56 +00:00
Jeod
e42a38e2d8
Merge pull request #224 from winterheart/git-hash
Introducing git revision in source code
2024-04-28 15:51:03 -04:00
Azamat H. Hackimov
79c7749242 Adding version to HogMaker 2024-04-28 22:05:26 +03:00
Azamat H. Hackimov
1926a77f19 Introducing git revision in source code
Git revision is generating on build time (not on configure time). In case of uncommited changes this revision will be marked as "dirty". If cmake cannot retrieve revision from git history (i.e. from packaged source code), cmake will attempt to read "git-hash.txt" from `PROJECT_SOURCE_DIR` (it will be generated on build time; after implementing packaging workflow it can be reworked).
Reworked main screen and console output to display proper version.
Version project now is 1.5.0 as previous PATCH value (500) was intended to be D3_RELEASE_BUILD_NO, autogenerated on compile time. As we switched to GIT_HASH, D3_RELEASE_BUILD_NO now useless.
2024-04-28 22:05:26 +03:00
Jeod
cfe06aeaaf
Merge pull request #223 from jcoby/fix-mouse-grab
Grab mouse after SDL_SetVideoMode
2024-04-28 13:37:48 -04:00
Jacob Coby
988653e01e Grab mouse after SDL_SetVideoMode
Fixes mouse cursor not being grabbed on macOS. Also sets the
`ddio_mouseGrabbed` flag correctly so it can be detected later on.

Fixes #201
2024-04-28 10:14:26 -04:00
Jeod
f001d82b80
Merge pull request #222 from DescentDevelopers/JeodC-patch-1
Update README.md
2024-04-28 09:41:30 -04:00
Jeod
b26193f603
Update README.md 2024-04-28 09:41:15 -04:00
Jeod
7cd46b7b52
Merge pull request #221 from DanielGibson/update-libacm
Update libacm
2024-04-28 09:12:36 -04:00