zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-25 21:41:03 +00:00
Code Issues Projects Releases Packages Wiki Activity
20308 commits 131 branches 149 tags 202 MiB
Commit graph

112 commits

Author SHA1 Message Date
Magnus Norddahl
dba514a2cf Fix CMakeLists.txt missing file error 2022-06-22 07:55:19 +02:00
Magnus Norddahl
5cc21c5a4a Upgrade glslang to 11.10.0 2022-06-22 07:55:19 +02:00
Magnus Norddahl
5e9906e3d3 Upgrade glsl compiler to 11.6.0 2022-06-22 07:55:19 +02:00
alexey.lysiuk
201652bb36 - removed useless linker flags set by Discord RPC for macOS 
This fixes lots of 'object file was built for newer macOS version than being linked' warnings
 2022-04-17 16:52:00 +03:00
alexey.lysiuk
4049a0d8f1 - updated zlib to 1.2.12 
https://www.zlib.net/zlib-1.2.12.tar.gz
 2022-03-31 09:47:31 +03:00
Christoph Oelckers
701b7c3902 - silence the noisy warning output of the discordrpc subproject. 2022-03-17 08:14:08 +01:00
Rachael Alexanderson
bfd0f8fa0a - silence error C5045 in MSVC 2022-03-11 11:02:55 -05:00
Rachael Alexanderson
47333badba - remove extra rapidjson library, use internal one from gzdoom instead 2022-03-11 10:55:30 -05:00
Rachael Alexanderson
e212fa1310 - remove drpc example files 2022-03-10 15:12:18 -05:00
Rachael Alexanderson
18def622b4 - remove examples from DiscordRPC library - we don't need them. the library is freely available for anyone who needs them. 2022-03-10 15:09:53 -05:00
Rachael Alexanderson
85c432c699 - Discord RPC presence. Adds new IWADINFO and GAMEINFO keys: DiscordAppId - this should point to your AppId for your game. It will use a default GZDoom one if not found. 2022-03-09 22:45:59 -05:00
alexey.lysiuk
6aea7694bc - updated LZMA to 21.07 
https://www.7-zip.org/sdk.html
https://www.7-zip.org/a/lzma2107.7z
 2022-01-01 15:58:40 +02:00
drfrag
bb8534ed00 Fix LZMA compilation with VS 32 bit. 
(patch by Igor Pavlov)
 2021-11-29 16:17:47 +01:00
alexey.lysiuk
9fac6058b7 - enabled LZMA multithreading on all platforms 2021-11-27 17:02:12 +02:00
alexey.lysiuk
121b89306a - updated LZMA to 21.06 
https://www.7-zip.org/sdk.html
https://www.7-zip.org/a/lzma2106.7z
 2021-11-27 17:00:53 +02:00
Christoph Oelckers
ba618d308c - bumped CMake version to 3.1.0 in all projects to reduce warning spam in recent versions. 
3.1.0 is the highest minimum set in the existing subprojects so this will not exclude anything that hadn't been already.
 2021-03-08 13:58:29 +01:00
alexey.lysiuk
0036f7fade - fixed wrong gdtoa definitions for Apple ARM64 
https://forum.zdoom.org/viewtopic.php?t=71303
 2021-01-28 12:56:10 +02:00
William Breathitt Gray
63aeea5b9e Force STATIC for internal GZDoom SPIRV library 
This makes sure the internal version of this library bundled with the
GZDoom source code is used. This prevents the system from building
GZDoom for dynamic linking with an incompatible external library (see
commit 6fafa297bf and
<https://forum.zdoom.org/viewtopic.php?f=2&t=64633>).
 2020-06-21 15:52:31 +03:00
Christoph Oelckers
c485256c74 Merge remote-tracking branch 'remotes/origin/zmusic_dll' 2020-02-15 10:22:45 +01:00
Magnus Norddahl
a056307218 Upgrade glslang to 8.13.3559 (stable release January 6, 2020) 2020-02-15 08:51:03 +01:00
Christoph Oelckers
2dd3c28d05 - transitioned engine to use ZMusic as a DLL. 2020-02-09 08:56:49 +01:00
alexey.lysiuk
c466422095 - fixed uninitialized variable in OPL song 
Mono streams could be erroneously treated as stereo, doubling their playback speed

https://forum.zdoom.org/viewtopic.php?t=66939
 2020-01-12 18:02:26 +02:00
Petr Mrázek
3c20d5fe88 - Run the Alsa MIDI thread every 40ms or so, use non-blocking sequencer 2020-01-04 20:19:36 +01:00
Christoph Oelckers
829d43baed - fixed warnings. 2020-01-04 09:44:48 +01:00
Rachael Alexanderson
3e4d53e8b6 - add EnumerateDevices for alsa per suggestion of the original author 2020-01-03 10:35:13 -05:00
Rachael Alexanderson
fabf3d8ca4 - fix compiler error with Alsa enumeration 2020-01-02 20:21:10 -05:00
Christoph Oelckers
8898448014 - refactored the MIDI list code. 
Let's hope nothing got broken on the Linux side, the recent submission's code was not usable.
 2020-01-02 14:21:26 +01:00
Christoph Oelckers
f442d2dc54 - made the sound decoding interface DLL friendly and added compile switches to the MIDI players so that different licenses can be uses as compile target. 2020-01-02 12:43:37 +01:00
Christoph Oelckers
77a20ea7d1 - forgot to save this one. 2020-01-02 08:47:03 +01:00
Christoph Oelckers
71cd4ef488 Merge branch 'master' of https://github.com/coelckers/gzdoom 
# Conflicts:
#	libraries/zmusic/zmusic/mididefs.h
#	libraries/zmusic/zmusic/zmusic.h
 2020-01-02 08:45:48 +01:00
Petr Mrázek
ea1b8de405 - Support for MIDI on Linux via alsa sequencer 2020-01-02 08:29:39 +01:00
Christoph Oelckers
d2ca1ea4e0 - rewrote the ZMusic interface so that it is free of C++ constructs. 
Now it is ready to put in a DLL.
 2020-01-02 01:26:01 +01:00
Christoph Oelckers
0d000344ca - replaced the C++ based file access wrapper in ZMusic with a C compatible version. 2020-01-01 22:54:27 +01:00
Christoph Oelckers
527fb40a5f - there's no need to let the XM Vorbis decoder run through the client - all related functionality is part of ZMusic itself. 2020-01-01 20:58:15 +01:00
Christoph Oelckers
47d70c839d - made adjustments to the remaining parts of the function interface. 2020-01-01 20:47:33 +01:00
Christoph Oelckers
7923d25cce - made the ZMusic interface more DLL friendly: Reworked all functions not to throw exceptions across the library boundary and made a few definitions internal. 
Not complete yet.
 2020-01-01 20:01:38 +01:00
Christoph Oelckers
c24f9b42ba - the timidity safe_malloc functions may not throw exceptions. 
There is a high chance of them getting called within the stream servicing function which cannot deal with abnormal conditions, so the only choice here is performing a hard abort.
 2020-01-01 17:34:37 +01:00
Christoph Oelckers
fe0a6b00ce - blocked the destructor in the sound font reader base class. 
If ZMusic is to act like an external library it may not call delete on external objects because there is no guarantee that they use the same allocator. Deletion must be done as a virtual function to ensure that the correct operator delete gets called, which, unlike the actual destructor is not virtual itself.
 2020-01-01 16:11:39 +01:00
Christoph Oelckers
0ee0034beb - apply the ZMusic mutex a bit more finely grained. 
It should only guard the critical parts, like calling Stop() but can let Update and IsPlaying method work unhindered otherwise.
 2019-10-20 16:16:40 +02:00
alexey.lysiuk
1deade93cf - fixed playback of gzip compressed music 
https://forum.zdoom.org/viewtopic.php?t=66157
 2019-10-19 11:40:01 +03:00
alexey.lysiuk
230da2e2b9 - fixed SPC music looping after update to GME 0.6.2 
Why was the default player setup changed at all?

https://forum.zdoom.org/viewtopic.php?t=65863
 2019-10-18 10:25:24 +03:00
alexey.lysiuk
50a876906e - added declarations missing from update to GME 0.6.2 2019-10-18 10:22:35 +03:00
Christoph Oelckers
4d8f0fc014 - fixed: ZMusic_Close may not lock the mutex because it will delete it. 
Here the calling code must ensure that the music object won't be accessible anymore before it gets deleted.
 2019-10-15 01:16:02 +02:00
Christoph Oelckers
6854a509e9 - Moved all music related synchronization to the top level 
Most of the synchronization was too deep in the implementation so that it did not guard everything it needed.

Now each song has precisely one mutex which must be locked for all access to its internals - this is done in the public ZMusic interface
 2019-10-15 00:49:40 +02:00
Christoph Oelckers
dc32c2148a - ZMusic interface refactoring. 
Use global functions instead of the class interface which exposed too many implementation details.
 2019-10-15 00:23:03 +02:00
alexey.lysiuk
5851de9e0c - added dynamic loading of FluidSynth 2.x 2019-10-13 10:09:51 +03:00
alexey.lysiuk
09dcb247cf - return null instead of throwing exception if CD playback isn't supported 
The game should switching to MIDI music on platforms without CD playback support
It was impossible to start Hexen on platforms other than Windows
 2019-10-12 09:57:58 +03:00
Christoph Oelckers
18464d571d Merge branch 'exit_cleanup' 2019-10-07 20:35:15 +02:00
Christoph Oelckers
523fd0bf3a Revert "AsmJit update" 
This reverts commit 747b3dfcfe.

# Conflicts:
#	libraries/asmjit/asmjit/core/compiler.h

This had to be reverted because it breaks exception handling which is a critical problem.
With the updated code any exception thrown inside code that had a JITed call stack would crash.
 2019-10-07 20:34:55 +02:00
alexey.lysiuk
53949e05f3 - handled differences of values returned by fluid_settings_...() functions 
FluidSynth 1.x: these functions return 1 on success and 0 otherwise
FluidSynth 2.x: these functions return  FLUID_OK (0) on success and FLUID_FAILED (-1) otherwise
 2019-10-07 12:32:40 +03:00