277 commits

Author	SHA1	Message	Date
James R	b21a0a8cf2	Fix module and chip music being SRB2 LOUD	2020-10-26 04:19:41 -07:00
Sally Coolatta	9b6aa946ea	Merge remote-tracking branch 'srb2/master' into the-scary-22-merge	2020-10-24 19:28:06 -04:00
Sally Coolatta	fda698a290	Merge master	2020-10-24 18:34:07 -04:00
James R	c9e3281b99	Merge remote-tracking branch 'origin/master' into tinnitus	2020-09-25 01:57:08 -07:00
James R	ef108cbb36	Merge remote-tracking branch 'pub/next'	2020-09-20 14:07:54 -07:00
James R	1818693d71	Fix NOGME compiling ... (cherry picked from commit d52a35e5b6)	2020-08-31 16:04:09 -07:00
James R	d52a35e5b6	Fix NOGME compiling	2020-08-24 17:51:01 -07:00
Steel Titanium	8ad5eaad2e	GME cleanup and fixes ... Just some stuff backported from SRB2 2.2, well mostly get_zlib_error function to reduce code duplication Return false if it fails to load the VGZ lump Reduce redundant calls to gme_set_equalizer Fix sometimes loading a VGZ crashing the game	2020-08-19 22:39:12 -04:00
Sally Coolatta	e296e1309a	YAY, round 2	2020-08-09 21:02:56 -04:00
James R	559029511b	Update sounds with correct volume	2020-08-07 13:10:13 -07:00
James R	aedc5ae7af	Kill MIDI more >:)	2020-08-07 13:00:04 -07:00
James R	374d032a6b	Clean up stuff, make volume work again	2020-08-07 12:29:37 -07:00
James R	7adf2159f6	Reduce songs and sounds to 1/4 volume, add a musicdef option for volume	2020-08-06 21:24:41 -07:00
Steel Titanium	55bace797f	Use SAMPLERATE for consistency with the rest of the code	2020-06-17 14:50:22 -04:00
Steel Titanium	26a2677863	Fix VGZ sometimes causing SRB2 to crash by not playing the song early in I_LoadSong	2020-06-17 14:31:49 -04:00
Steel Titanium	aab378fe1a	Reduce code duplication by creating get_zlib_error function ... Reduce calls to gme_set_equalizer in I_LoadSong by moving it to I_PlaySong Return false if it fails to decompress VGZ data in some form.	2020-06-17 14:19:19 -04:00
mazmazz	167e889046	Fix OPENMPT deprecation error, openmpt_module_ctl_set	2020-06-08 00:09:29 -04:00
SteelT	9ff6af856e	Resolve conflicts on the SDL interface files.	2020-05-29 16:17:26 -04:00
Sally Coolatta	63917ffccc	The start of the scary 2.2 merge ... All conflicts are left in-tact. We should be collaborating on solving these files one at a time.	2020-05-29 13:43:38 -04:00
James R	dd1715aa15	Optionally only resync Invincibility and Grow music	2020-03-21 22:28:55 -07:00
James R	e9c0e65e0e	Only resync music if in a level	2020-03-21 22:28:54 -07:00
James R	d1dce97d15	Don't resync if it's disabled	2020-03-21 22:28:54 -07:00
James R	530cac8673	Hey it's audio- ....resynching...	2020-03-21 22:28:54 -07:00
James R	2274129f57	Update copyright year to 2020	2020-02-19 14:08:45 -08:00
James R	469e5a7c9b	Fix NOPNG compiling	2019-12-24 11:37:37 -08:00
Steel Titanium	147960f4db	Correct comment	2019-12-06 17:10:14 -05:00
Steel Titanium	a5cdb0a4b3	Update copyright date on source files	2019-12-06 13:49:42 -05:00
toaster	ce4f322af7	Mixed declaration + out-of-bounds GCC error fixes for OpenMPT fixes (can't believe I didn't catch the former earlier)	2019-10-13 12:17:24 +01:00
Steel Titanium	65bc2ef0d6	Fix crash if speed is too high ... Also update libopenmpt	2019-09-27 23:53:19 -04:00
mazmazz	0d38d7087b	Use strtok instead of strtok_r	2019-08-07 01:29:05 -04:00
toaster	b928c5fc98	Revert "Revert "Fix MIDI Soundfont code shadowing a global variable."" ... This reverts commit d880a02fa1.	2019-08-04 12:04:01 +01:00
toaster	534b98251b	Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'"" ... This reverts commit a76668f55a.	2019-08-04 12:03:57 +01:00
toaster	a76668f55a	Revert "Merge branch 'musicplus-aug2019-b' into 'master'" ... This reverts commit 0f89fb123f, reversing changes made to 8fb211d8cf.	2019-08-04 11:32:55 +01:00
toaster	d880a02fa1	Revert "Fix MIDI Soundfont code shadowing a global variable." ... This reverts commit 8a1b36322d.	2019-08-04 11:28:04 +01:00
toaster	8a1b36322d	Fix MIDI Soundfont code shadowing a global variable.	2019-08-04 10:28:10 +01:00
mazmazz	12e86aaa44	Merge branch 'internal-musicplus-jingle' into musicplus-aug2019	2019-08-04 02:41:37 -04:00
mazmazz	753ea04fe3	Mixer X menu touchup	2019-08-04 02:30:34 -04:00
mazmazz	8ab76b50c6	Merge remote-tracking branch 'origin/master' into musicplus-sdlmixerx	2019-08-04 01:10:21 -04:00
mazmazz	ae05d8c0dd	Merge remote-tracking branch 'origin/master' into internal-musicplus-jingle	2019-08-03 23:38:49 -04:00
Alam Ed Arias	644aba78d5	Merge branch 'public_next' into private	2019-07-29 18:31:01 -04:00
Alam Ed Arias	62e45e5f5b	SDL2: fixed compiling mixer interface with MSVC	2019-07-29 17:56:35 -04:00
Steel Titanium	490e3fe9a9	Merge branch 'master' into musicplus-sdlmixerx	2019-07-22 22:20:08 -04:00
Steel Titanium	d44702cb0e	Some fixup	2019-07-22 22:01:05 -04:00
Monster Iestyn	f266eda97b	Merge branch 'public_next'	2019-07-16 18:28:49 +01:00
Steel Titanium	db525c43a7	Fix crash with GME sounds when being freed	2019-07-14 14:55:04 -04:00
Monster Iestyn	3fec42c436	Add static keyword to these variables for correctness	2019-07-14 16:23:01 +01:00
Steel Titanium	c0927754a1	Seperate declarations from code	2019-07-09 15:51:11 -04:00
Steel Titanium	ccecb4c6cd	Some few comments	2019-07-09 00:56:22 -04:00
Steel Titanium	2b3118b288	Better loading code for modules	2019-06-29 20:35:31 -04:00
mazmazz	f7936876be	Merge branch 'master' into musicplus-sdlmixerx	2019-06-29 19:31:01 -04:00