Cronocide/Descent3
1
0
Fork 0
mirror of https://github.com/kevinbentley/Descent3.git synced 2025-01-22 19:55:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
121 Commits 5 Branches 1 Tag 96 MiB
98ed4599a5
Commit Graph

121 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Bentley
98ed4599a5
Merge pull request #84 from midnite8177/fix-libmve 
Fix libmve so movies rendering correctly
 2024-04-18 22:25:31 -06:00
Jeff Slutter
2c4c3b339b Fixing an accidental change back 2024-04-18 22:52:05 -05:00
Jeff Slutter
6fc71b1e13 Enable all codec opcodes. We had disabled some when trying to debug the code years ago and not all got re-enabled. 2024-04-18 22:43:04 -05:00
Jeod
1edaa3b628
Merge pull request #77 from jcoby/remove-dmono 2024-04-18 17:35:37 -04:00
Jacob Coby
95f1cad545 Remove MONO define 
Fixes `mprintf` and `mprintf_at` calls from causing a segfault.

MONO was used to output debugging info to a monochrome monotor.
 2024-04-18 17:15:32 -04:00
Jeod
4f5bd86c1c
Merge pull request #70 from Lgt2x/linux-clang 
Fix Linux clang build
 2024-04-18 14:50:55 -04:00
Louis Gombert
2760c3c3fc
Merge pull request #18 from danra/fix_SetSearchPath 
Fix cf_SetSearchPath bad memory access
 2024-04-18 18:48:18 +00:00
Dan Raviv
aaefe86a2a Fix cf_SetSearchPath bad memory access (tested on macOS) 2024-04-18 10:33:21 -07:00
Louis Gombert
c68d6419c9 Linux-clang: also apply -Wno-address-of-temporary 2024-04-18 19:15:58 +02:00
Louis Gombert
47f0f6e443 UIEdit: set char to 0 instead of NULL 2024-04-18 19:14:25 +02:00
Azamat H. Hackimov
6572274883
Merge pull request #69 from GravisZro/fix/gitignore 
Add Linux and D3 specific .gitignore entries
 2024-04-18 19:54:09 +03:00
GravisZro
435c1dd056 Add Linux and D3 specific .gitignore entries 
Ignore these:
build/ (CMake build directory)
*.so (Linux)
*.hog (D3)
 2024-04-18 12:27:20 -04:00
Azamat H. Hackimov
780ce5e34e
Merge pull request #63 from Jayman2000/allow-additional-cmake-flags 
Allow user to specify additional compiler flags
 2024-04-18 14:42:18 +03:00
Jason Yundt
0dfbcb5076 Allow user to specify additional compiler flags 
I’m trying to compile Descent 3 on NixOS, but when I run
“cmake --build <path>”, I get this error:

/home/jayman/Documents/Home/VC/Git/Partially mine/Descent3/repo/Descent3/multi_connect.cpp: In function 'int TryToJoinServer(network_address*)':
/home/jayman/Documents/Home/VC/Git/Partially mine/Descent3/repo/Descent3/multi_connect.cpp:358:16: error: format not a string literal and no format arguments [-Werror=format-security]
  358 |         sprintf(str, TXT(Join_response_strings[Ok_to_join]));
      |         ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Eventually, we should actually fix that sprintf call (and any other
calls that would trigger format security warnings), but it would be nice
if users could just temporarily ignore stuff like that.

This commit makes it so that users can set custom complier flags by
doing this:

	$ cmake \
		--preset <preset> \
		-B build \
		-DCMAKE_C_FLAGS=<additional-c-flags> \
		-DCMAKE_CXX_FLAGS=<additional-cxx-flags>
	$ cmake --build build
 2024-04-18 07:21:43 -04:00
Louis Gombert
ee5478328c
Merge pull request #60 from Arcnor/macos-runners 
enable both Intel & M1 macOS runners
 2024-04-18 07:40:13 +00:00
Edu Garcia
099d6980f1
Merge pull request #54 from winterheart/cmake-fixes 
Fixes and enhancements to CMake build system
 2024-04-18 08:21:46 +01:00
Edu Garcia
dcfdbf0fcf enable both Intel & M1 macOS runners 2024-04-18 08:18:08 +01:00
Edu Garcia
316d50a706
Merge pull request #59 from Lgt2x/fix-hog-64 
Fix HOG file entry parser in 64 bit architectures
 2024-04-18 07:55:17 +01:00
Edu Garcia
5ce124dec7
Merge pull request #58 from mstephenson6/arm64-to-aarch64 
Use __aarch64__ instead of __arm64__ for Linux builds
 2024-04-18 07:53:39 +01:00
Louis Gombert
3d16ced83f
Merge pull request #57 from MaddTheSane/va_end 
Add va_end calls
 2024-04-18 06:30:22 +00:00
Edu Garcia
623cafc8f9
Merge pull request #29 from danra/mac_ci_fixes 
Mac CI fixes
 2024-04-18 07:25:58 +01:00
Louis Gombert
622b8278dc Fix HOG file entry parser in 64 bit architectures 
timestamp is 4 bytes in the file, but is read as an 8-bytes long when built on 64 bit architectures, screwing up the read offset
 2024-04-18 08:23:22 +02:00
Matt Stephenson
e1af942a13 Use __aarch64__ instead of __arm64__ for Linux builds 
Signed-off-by: Matt Stephenson <mstephenson6@users.noreply.github.com>
 2024-04-18 01:34:24 -04:00
C.W. Betts
1cbf303c2d
Update lnxcon.cpp 
add missing va_end
 2024-04-17 19:19:18 -06:00
C.W. Betts
f9b8ff78ed
Update CFILE.cpp 
add missing va_end
 2024-04-17 19:16:39 -06:00
C.W. Betts
116ac8d195
Update dedicated_server.cpp 
Add missing va_end
 2024-04-17 19:15:41 -06:00
Jeod
c15f270c61
Merge pull request #55 from winterheart/byteswap-dublicate 
Remove duplicate byteswap.h
 2024-04-17 20:48:39 -04:00
Azamat H. Hackimov
9e6ebbc8fb Remove dublicate byteswap.h 
Linux-specific byteswap.h just includes BYTESWAP.H, so there no need platform-specific header.

Fixes "non-portable path to file" ([-Wnonportable-include-path]) warnings.
 2024-04-18 03:20:36 +03:00
Azamat H. Hackimov
3f7666eaac Fixes and enhancements to CMake build system 
Updated compatibility level to 3.19. Set C++17 globally for all platforms. Removed hardcoded compiler and optimisation flags. Adjusted dependencies and libraries linking.

Reworked script building and hog creation.
 2024-04-18 03:04:16 +03:00
Azamat H. Hackimov
84c04ebf13
Merge pull request #45 from ei-grad/linux-build 
Enable Linux CI build
 2024-04-18 02:23:12 +03:00
Dan Raviv
c9cc616786 Use a multi-config generator in the CMake macos preset 
Specifically Ninja Multi-Config (it's fast)

Fixes CI not actually building multiple configs, as well as artifacts not found in expected locations
 2024-04-17 16:20:47 -07:00
Dan Raviv
439636031b [CI] Install Ninja on macOS 2024-04-17 16:20:47 -07:00
Azamat H. Hackimov
e2dcbe382b
Merge pull request #52 from MaddTheSane/patch-1 
Update procedurals.h
 2024-04-18 02:12:27 +03:00
Andrew Grigorev
47086078ac Merge branch 'main' of github.com:kevinbentley/Descent3 into linux-build 2024-04-18 02:00:35 +03:00
C.W. Betts
44eae3de9d
Update procedurals.h 
Quiet a warning about header guard not matching the defined macro.
 2024-04-17 16:52:50 -06:00
Jeod
9af13e49bd
Rename artifacts (#50) 
* Rename artifacts

Artifacts are currently all named build-Debug and build-Release. Include the platform in the name.
 2024-04-17 18:48:51 -04:00
Andrew Grigorev
bacf598ced Remove more redundant libs 2024-04-18 01:48:03 +03:00
Andrew Grigorev
7010261c9c Revert fork CI change 2024-04-18 01:44:21 +03:00
Azamat H. Hackimov
b36325cc5d
Merge pull request #51 from winterheart/clang-format 
Clang format
 2024-04-18 01:14:22 +03:00
Azamat H. Hackimov
d83acc2862 clang-format-ignore support appears in 18 version 
Remove temp file.
 2024-04-18 00:49:26 +03:00
Azamat H. Hackimov
a6d90107bf Re-format with clang-format recently changed files 2024-04-18 00:46:57 +03:00
Andrew Grigorev
5a1629ccd5 Create D3_GAMEDIR directory 2024-04-18 00:09:13 +03:00
Andrew Grigorev
46c950d1a7 Fix PLATFORM_LIBS on Linux 2024-04-17 23:17:44 +03:00
Andrew Grigorev
889602853c Make hogUtils-i686 binary executable (needed for build to succeed) 2024-04-17 23:17:44 +03:00
Andrew Grigorev
1eb8782cb3 Trigger Github Actions for all pushes in forks 2024-04-17 23:17:44 +03:00
Andrew Grigorev
4eb96c6b35 Check Linux build in Github Actions 2024-04-17 23:17:44 +03:00
Louis Gombert
494d5889ad
Merge pull request #23 from th1000s/minmax 
Convert min/max macros to std::min/max
 2024-04-17 20:16:43 +00:00
Thomas Otto
b909a4cf43 Convert min/max macros to std::min/max 
Added explicit <float> or <int> template argument where needed.
Add -DNOMINMAX define for Windows.
 2024-04-17 21:43:38 +02:00
Jeod
97a22f5bf2
Use clang-format with manual trigger only 
Clang-format is conflicting with several pull requests and even current code. Change it to manual use for the time being.
 2024-04-17 15:37:50 -04:00
Louis Gombert
4247f30c3d
Merge pull request #21 from th1000s/misc_linux 
Linux build fixes: remove unused osMutex code and typedefs
 2024-04-17 18:46:42 +00:00