Cronocide/Descent3
1
0
Fork 0
mirror of https://github.com/kevinbentley/Descent3.git synced 2025-01-23 03:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
212 Commits 5 Branches 1 Tag 96 MiB
6352ab21b9
Commit Graph

212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Azamat H. Hackimov
6352ab21b9 Fix possible heap buffer overflow 
Strict size of name of entry with 36 bytes.
Thanks to MaddTheSane for pointing out.
 2024-04-22 02:37:42 +03:00
Edu Garcia
ebc78a6463
Merge pull request #139 from winterheart/linux-clang 
CI: Add Linux / clang to build matrix
 2024-04-21 21:24:34 +01:00
Kevin Bentley
1fd8876f60
Merge pull request #135 from DanielGibson/use-libacm 
Use upstream libacm 1.3 for ACM audio decoding
 2024-04-21 13:46:27 -06:00
Azamat H. Hackimov
9e9b713507
Merge pull request #109 from Lgt2x/clang-warnings 
Fix some clang warnings
 2024-04-21 22:08:07 +03:00
Daniel Gibson
55181313c9 Fix loop in InternalAudioDecoder::Read() 2024-04-21 20:26:02 +02:00
Louis Gombert
c486919477 Fix -Wtautological-pointer-compare 2024-04-21 20:24:31 +02:00
Louis Gombert
491db4254a Fix -Wdangling-else 2024-04-21 20:24:31 +02:00
Louis Gombert
43af644827 Fix -Wparentheses 2024-04-21 20:24:31 +02:00
Louis Gombert
a807c99283 Fix -Wparentheses-equality 2024-04-21 20:24:31 +02:00
Louis Gombert
04e8aeb247 Fix -Wswitch 2024-04-21 20:24:31 +02:00
Louis Gombert
466a142ba3 Fix -Wcomment 2024-04-21 20:24:31 +02:00
Louis Gombert
f1ec3d76c6
Merge pull request #122 from winterheart/hogutils 
Own implementation of HogUtils - HogMaker
 2024-04-21 18:08:39 +00:00
Azamat H. Hackimov
6a6f6570be CI: Add Linux / clang to build matrix 2024-04-21 20:17:04 +03:00
Jeod
7463cb7d97
Merge pull request #123 from danra/ci_multi_config 
[CI] Use same job for both Debug and Release builds
 2024-04-21 12:38:31 -04:00
Daniel Gibson
f8aba67c56 Remove libacm/util.c 
not needed, only using functionality of decode.c
 2024-04-21 18:35:56 +02:00
Daniel Gibson
89bb0a54a8 Implement an IAudioDecoder that uses libacm 
removed libacm.cpp, it's now in adecode.cpp, I think that's less
confusing now that the actual upstream libacm code is also in libacm/

This fixes the crash reported in #83
 2024-04-21 18:35:56 +02:00
Daniel Gibson
a55f1a33aa Make libacm.h C++-aware 
see also https://github.com/markokr/libacm/pull/1
 2024-04-21 18:35:56 +02:00
Daniel Gibson
94ce70bb89 AudioDecoder: Get rid of custom malloc/free functions 
were never set anyway, and (the real) libacm doesn't support custom
allocators.
 2024-04-21 18:25:52 +02:00
Daniel Gibson
f6f3c334de Import source of libacm 1.3, integrate it into CMake build 
only the sourcefiles needed here,
from https://github.com/markokr/libacm
 2024-04-21 18:25:45 +02:00
Daniel Gibson
f61f34971d Add FORCE_COLORED_OUTPUT option (for GCC and Clang) to CMakeLists.txt 
To enforce colorful compiler warnings when building with Ninja
(and GCC/Clang) on Linux and similar platforms.

Taken from dhewm3 (where I implemented it).
 2024-04-21 18:21:42 +02:00
Dan Raviv
eb1ad62b8b Verbose build in CI 
Useful for debugging CI and build issues
 2024-04-21 09:21:41 -07:00
Dan Raviv
462ae4de3f [CI] Use same job for both Debug and Release builds 
Making use of CMake's multi-config generators which we're using.
Simpler and more efficient, halves number of jobs.
 2024-04-21 09:21:15 -07:00
Azamat H. Hackimov
1765d07790 Remove now unused hogUtils-i686 2024-04-21 19:15:23 +03:00
Azamat H. Hackimov
f19510ef2f Generate HOG files as dependencies for Descent3 
Generated d3-linux.hog now places next to Descent3 executable, ready to play. Scripts also generated in ${CMAKE_BINARY_DIR} and don't pollutes source dir.
 2024-04-21 19:15:23 +03:00
Azamat H. Hackimov
fb0dabc367 Implementing HogMaker replacement of HogUtils 
Currently, this tool can make only create HOG from list of files taken from text file (one line per file).
 2024-04-21 19:15:23 +03:00
Jeod
84938fc52f
Merge pull request #133 from Jayman2000/remove-unnecessary-build-dependency 
Remove unnecessary build dependency
 2024-04-21 09:03:34 -04:00
Jason Yundt
423dfdb249 Remove unnecessary build dependency 
2d4d82d (Accurately find the linux artifacts (#80), 2024-04-19) made it
so that make no longer gets used as a part of the build process, but it
didn’t remove make from the list of build dependencies.
 2024-04-21 08:59:56 -04:00
Louis Gombert
07d988e194
Merge pull request #127 from th1000s/cmakefixes 
CMake consistent white space formatting
 2024-04-21 10:12:48 +00:00
Thomas Otto
00389c50ea Some more CMake white space formatting 
- tabs to spaces
 - use Unix line endings everywhere
 - newline at end of file
 - remove trailing white space
 - no space between keywords and opening parenthesis
 - use 2 spaces to indent
 2024-04-21 11:46:32 +02:00
Louis Gombert
8e531a5496
Merge pull request #124 from danra/brew_cmake 
Add cmake to Brewfile, simplify instructions
 2024-04-21 08:00:25 +00:00
Dan Raviv
f142a65a15 Add cmake to Brewfile, simplify instructions 2024-04-20 20:28:38 -07:00
Jeod
8e947628ca
Merge pull request #106 from DescentDevelopers/issue-templates 
Add issue templates, adjust gitignore for windows
 2024-04-20 20:05:41 -04:00
Jeod
05599feb33
Merge pull request #119 from DescentDevelopers/JeodC-patch-1 2024-04-20 18:04:04 -04:00
Jeod
fea041475e
Add missing prerequisite 2024-04-20 18:03:55 -04:00
Jeod
c8f5fcdc9a
Merge pull request #118 from DescentDevelopers/JeodC-patch-1 2024-04-20 18:02:19 -04:00
Jeod
76ae823250
Correct typos 2024-04-20 18:02:06 -04:00
Louis Gombert
0f4b854cf9
Merge pull request #116 from DescentDevelopers/readme-update 
Update README.md
 2024-04-20 21:52:37 +00:00
Louis Gombert
9e56f39ae6
Merge pull request #117 from GravisZro/fix/warnings 
More simple warning fixes
 2024-04-20 21:40:09 +00:00
GravisZro
534ddfef24 More simple warning fixes 
This should be the remaining NULL/'\0' conflation fixes. This also fixes
a handful of type declarations. No significant changes.
 2024-04-20 16:22:29 -04:00
Jeod
f929310f9d
Update README.md 2024-04-20 16:04:14 -04:00
JeodC
1382d9f2af Add proposed changes 2024-04-20 13:53:21 -04:00
Louis Gombert
3515bc0043
Merge pull request #82 from th1000s/fix 
Fix -fpermissive issues, remove workaround flags
 2024-04-20 17:17:28 +00:00
Kevin Bentley
23503d144c
Merge pull request #96 from Lgt2x/add-missing 
Add D3 utilities source (from kevinbentley/add-missing)
 2024-04-20 10:40:42 -06:00
Louis Gombert
51e8f034ed Remove license from html files 2024-04-20 18:34:49 +02:00
Louis Gombert
31b63bb79f Add license to legacy utilities 
Generated using script:
for file in \$(find ./legacy -type f | \grep -E "\.cpp|\.h")
do
  mv $file temp.xxx
  cp gplheader $file
  cat temp.xxx >> $file
done
 2024-04-20 18:33:12 +02:00
Louis Gombert
b0f7dc1437 Add D3 utilities source (from kevinbentley/add-missing) 
Kevin Bentley <kevin.bentley@gmail.com>
 2024-04-20 18:33:12 +02:00
Kevin Bentley
f3ddb1aa28 Hog Utilities 2024-04-20 18:33:12 +02:00
Kevin Bentley
7cdb405702 A bunch of other files from D3 to sort through. 2024-04-20 18:33:12 +02:00
Kevin Bentley
8897c4365f
Merge pull request #113 from kevinbentley/license-clarification 
License clarification
 2024-04-20 10:17:28 -06:00
Kevin Bentley
44c4f867e8 Removed extraneous license 2024-04-20 10:15:38 -06:00