Christoph Oelckers
115675417a
Merge branch 'master' into powerslave
2019-11-28 17:07:11 +01:00
hendricks266
510e737360
SW: Fix "MV_GetVoice(): bad handle" log spam
...
git-svn-id: https://svn.eduke32.com/eduke32@8311 1a8010ca-5511-0410-912e-c29ae57300e0
# Conflicts:
# source/sw/src/draw.cpp
# source/sw/src/menus.cpp
2019-11-26 18:08:43 +01:00
nukeykt
6c9e6a3bfc
Sound wip
...
# Conflicts:
# source/audiolib/include/fx_man.h
# source/audiolib/include/multivoc.h
2019-11-21 23:09:04 +01:00
Christoph Oelckers
ec6ce8b1ec
- hooked up ZMusic.
2019-11-11 19:10:46 +01:00
hendricks266
c6c7c91d7c
Add MIDI_GetDevice and use it so that the default driver value doesn't show as "Custom" in the menu
...
git-svn-id: https://svn.eduke32.com/eduke32@8261 1a8010ca-5511-0410-912e-c29ae57300e0
2019-10-24 19:44:22 +02:00
terminx
5853fe1cc6
Prefer uint32_t over unsigned int
...
git-svn-id: https://svn.eduke32.com/eduke32@8225 1a8010ca-5511-0410-912e-c29ae57300e0
# Conflicts:
# source/audiolib/src/_al_midi.h
2019-10-24 19:26:30 +02:00
terminx
8eb5233232
Further audiolib work... I think this is almost done!
...
git-svn-id: https://svn.eduke32.com/eduke32@8219 1a8010ca-5511-0410-912e-c29ae57300e0
# Conflicts:
# GNUmakefile
# platform/Windows/audiolib.vcxproj
# platform/Windows/audiolib.vcxproj.filters
# platform/Windows/build.vcxproj
# platform/Windows/build.vcxproj.filters
# source/audiolib/include/al_midi.h
# source/audiolib/src/_al_midi.h
# source/duke3d/src/osdcmds.cpp
# source/duke3d/src/sounds.cpp
2019-10-24 19:25:48 +02:00
terminx
8b20118026
Audiolib rework WIP
...
This attempts to rectify the differences between versions of JFAudiolib created after we forked the code, and the extra features contained in Nuke.YKT's fork of our version.
git-svn-id: https://svn.eduke32.com/eduke32@8216 1a8010ca-5511-0410-912e-c29ae57300e0
# Conflicts:
# GNUmakefile
# platform/Windows/audiolib.vcxproj
# platform/Windows/audiolib.vcxproj.filters
# platform/Windows/eduke32.vcxproj
# platform/Windows/eduke32.vcxproj.filters
# source/audiolib/include/fx_man.h
# source/audiolib/include/multivoc.h
# source/audiolib/src/flac.cpp
# source/audiolib/src/formats.cpp
# source/audiolib/src/fx_man.cpp
# source/audiolib/src/vorbis.cpp
# source/audiolib/src/xa.cpp
# source/audiolib/src/xmp.cpp
# source/duke3d/src/sounds_mapster32.cpp
# Conflicts:
# Common.mak
# GNUmakefile
# platform/Windows/audiolib.vcxproj
# platform/Windows/audiolib.vcxproj.filters
# platform/Windows/eduke32.vcxproj
# platform/Windows/eduke32.vcxproj.filters
# source/audiolib/include/multivoc.h
# source/audiolib/src/vorbis.cpp
# source/duke3d/src/config.cpp
# source/duke3d/src/game.h
# source/duke3d/src/osdcmds.cpp
# source/duke3d/src/sounds_mapster32.cpp
2019-10-24 19:24:31 +02:00
Christoph Oelckers
5050716bc0
- removed most extern "C" from the rest of the code base.
2019-09-21 20:14:34 +02:00
Christoph Oelckers
c2e4a6cb64
- sound system additions from NBlood, except for the backing code for OPL playback.
2019-09-19 20:22:09 +02:00
terminx
e513e1ceae
Cleanup includes
...
git-svn-id: https://svn.eduke32.com/eduke32@7186 1a8010ca-5511-0410-912e-c29ae57300e0
2018-11-18 18:09:48 +00:00
terminx
374a09536d
Add per-sound volume support to audiolib. This allows you to control the volume of sounds independently from the distance-based system exposed through CON. To use this, you must define your sounds via the .def syntax and set the "volume" property--default is 1.0.
...
git-svn-id: https://svn.eduke32.com/eduke32@7117 1a8010ca-5511-0410-912e-c29ae57300e0
2018-10-25 23:32:14 +00:00
hendricks266
62a921c409
Remove the implicit "static" from our FORCE_INLINE macro.
...
This will be important for C++ member functions.
git-svn-id: https://svn.eduke32.com/eduke32@6076 1a8010ca-5511-0410-912e-c29ae57300e0
2017-02-25 08:15:53 +00:00
hendricks266
1cc9d13ccf
The great repository rearrangement of 2017.
...
Files moved but not modified. Changes to follow in a subsequent commit.
You down with CPP?
git-svn-id: https://svn.eduke32.com/eduke32@6055 1a8010ca-5511-0410-912e-c29ae57300e0
2017-02-01 10:01:11 +00:00
