242 commits

Author	SHA1	Message	Date
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
mazmazz	7bbd05e85d	Merge branch 'public-notpublic-musicplus-jingle' into internal-musicplus-jingle	2019-06-29 18:33:45 -04:00
mazmazz	53fe455a8f	Merge branch 'public-musicplus-jingle' into public-notpublic-musicplus-jingle	2019-06-29 18:10:44 -04:00
Steel Titanium	813ccf71e5	Merge branch 'next' into public-musicplus-libopenmpt	2019-06-03 15:36:50 -04:00
Steel Titanium	ff040ccced	Update libopenmpt to 0.4.4	2019-05-23 22:05:28 -04:00
Steel Titanium	ea29bae39e	Forgot some references	2019-05-20 23:31:23 -04:00
Steel Titanium	991181afa2	circleci: Fix compiling error	2019-05-20 23:22:23 -04:00
mazmazz	d2236a32c3	Remove song_length tag search ... Because songs without this tag will skiplag when loading.	2019-05-02 19:14:23 -04:00
mazmazz	7301140b10	Remove MP3 widechar tag searching ... 1. It's slow, 2. It's incorrect	2019-05-02 19:13:56 -04:00
mazmazz	7f0b923107	Merge branch 'public-gl-next' into public-musicplus-jingle	2019-03-15 18:42:19 -04:00
mazmazz	832a6433c2	Remove MP3 warning	2019-03-13 19:51:45 -04:00
Steel Titanium	d475bcb0b7	Some few changes	2019-01-05 23:42:25 -05:00
mazmazz	2c2a96b554	MUS_MODPLUG fix	2019-01-04 18:39:09 -05:00
mazmazz	c0ca2c8980	Remove dynamic openmpt loading	2019-01-03 20:52:09 -05:00
Marco Z	51976778e2	Fix MSVC compile errors	2019-01-03 20:34:10 -05:00
mazmazz	1dd2899521	Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt	2019-01-02 02:14:49 -05:00
mazmazz	8dc37a850b	Fix loop_point and song_length floating point comparisons	2019-01-01 10:47:16 -05:00
mazmazz	2326a58bc7	Merge remote-tracking branch 'public-gl/master' into public-musicplus-core	2019-01-01 10:41:40 -05:00
Digiku	7920dbe4a8	Merge branch 'float_equal' into 'master' ... Clear Float equal warnings See merge request STJr/SRB2!383	2018-12-20 16:58:37 -05:00
Alam Ed Arias	261e1e623c	Clear float equal warnings	2018-12-14 20:34:06 -05:00
mazmazz	71aa97fc22	Force directsound to fix wrong-pitch sound effects	2018-12-08 14:05:58 -05:00
Sryder	0847d7e29d	Fix 2 of the Unsuffixed Float Constant warnings ... The other one is related to M_PI for me, which I'm still not sure about where it's getting it from	2018-11-29 22:12:14 +00:00
mazmazz	89a3c889dd	stray #if to #ifdef	2018-11-19 20:52:01 -05:00
Alam Ed Arias	45c8920bb1	Clean up warnings	2018-11-14 10:52:16 -05:00
mazmazz	366aeadac4	Fix x64 build issue	2018-11-13 17:12:18 -05:00