Randy Heit 775e33ede7 Merge branch 'master' into scripting ... Conflicts: src/actor.h src/g_doom/a_archvile.cpp src/g_shared/a_morph.cpp src/p_enemy.h src/p_local.h src/p_mobj.cpp src/sc_man_tokens.h src/thingdef/thingdef_codeptr.cpp src/thingdef/thingdef_exp.h src/thingdef/thingdef_expression.cpp src/thingdef/thingdef_states.cpp wadsrc/static/actors/actor.txt		2015-01-29 20:53:08 -06:00
..
fmod_wrap.h
fmodsound.cpp	- Disable cubic and spline resamplers on 64-bit with fmod 4.26 since they crash.	2014-07-15 21:07:07 -04:00
fmodsound.h	- Added S_ChangeSoundVolume() to change the volume of an already playing sound, accessible	2013-06-01 17:46:50 +00:00
i_music.cpp	Removed unnecessary SDL #include's	2014-12-16 22:56:09 +02:00
i_music.h
i_musicinterns.h	Removed unnecessary SDL #include's	2014-12-16 22:56:09 +02:00
i_sound.cpp	- fixed: The VOC reader didn't advance the read index correctly.	2014-09-15 11:32:40 +02:00
i_sound.h	- Added S_ChangeSoundVolume() to change the volume of an already playing sound, accessible	2013-06-01 17:46:50 +00:00
i_soundinternal.h
music_cd.cpp
music_dumb.cpp
music_fluidsynth_mididevice.cpp	- Use a more conformant C++ preprocessor macro identifier for Unix systems.	2013-07-30 11:46:14 +02:00
music_gme.cpp	- Allow use of system GME library. It defaults to forcing the use of the internal library at least for now though.	2013-11-06 13:37:34 -05:00
music_hmi_midiout.cpp
music_midi_base.cpp
music_midi_timidity.cpp	Fixed another potential crash in word expansion API	2014-11-16 10:29:03 +02:00
music_midistream.cpp	- fixed: Creating an OPL MIDI device can fail if no GENMIDI lump is found, and an exception is thrown. We need to handle this exception to prevent an abort.	2014-10-24 22:56:10 +02:00
music_mus_midiout.cpp
music_mus_opl.cpp	- Fixed: All clang 5.0 warnings.	2014-01-05 19:50:09 -05:00
music_pseudo_mididevice.cpp
music_smf_midiout.cpp
music_softsynth_mididevice.cpp
music_stream.cpp
music_timidity_mididevice.cpp
music_win_mididevice.cpp
music_xmi_midiout.cpp