245 commits

Author	SHA1	Message	Date
mazmazz	701cc5a7dd	Consolidate I_SetDigMusicVolume and I_SetMIDIMusicVolume into one method ... * In s_sound, they are merged to one method as well, but there are still two separate digvolume and seqvolume variables * Simplified Dig/MidiMusicDisabled in s_sound * Method reordering	2018-08-23 11:54:36 -04:00
mazmazz	14b393ab16	Added I_GetMusicType and removed midimode variable: other targets	2018-08-23 10:19:04 -04:00
mazmazz	55f3803e4b	Added I_GetMusicType and removed midimode variable ... * Revised S_PlayMusic arguments * Now music plays again!	2018-08-23 10:18:38 -04:00
mazmazz	9a5fc5f66a	Loose ends other targets	2018-08-23 09:37:02 -04:00
mazmazz	e89eccf78e	Loose ends from previous work ... * Pause/ResumeSong remove handle argument * LoadSong declare char *data argument * Variable weirdness	2018-08-23 09:36:51 -04:00
mazmazz	3ec1a122e0	Revert "Nix'd midimusicvolume other targets" ... This reverts commit 58fbb4636f. # Conflicts: # src/android/i_sound.c # src/dummy/i_sound.c # src/win32/win_snd.c	2018-08-23 09:09:12 -04:00
mazmazz	75cbfab8c6	Playback routines other targets	2018-08-23 09:06:31 -04:00
mazmazz	7efab8b314	Revert "Nix'd midimusicvolume", don't know what I want to do with this yet ... This reverts commit b5c3095820. # Conflicts: # src/i_sound.h # src/s_sound.c # src/s_sound.h # src/sdl/mixer_sound.c	2018-08-23 09:06:13 -04:00
mazmazz	e42defa299	Playback routines: Load, Play, Pause, Stop, Unload ... * Re-purpose I_LoadSong for digital music loading * I_StartDigSong logic split between I_LoadSong and I_PlaySong * Pause, Stop, and Unload routines are combined from Digi and MIDI * music_lumpnum, music_data, music_handle from s_sound.c are gone	2018-08-23 09:02:14 -04:00
mazmazz	58fbb4636f	Nix'd midimusicvolume other targets	2018-08-23 07:39:45 -04:00
mazmazz	b5c3095820	Nix'd midimusicvolume	2018-08-23 07:39:32 -04:00
Monster Iestyn	87e37e21df	Merge branch 'public_next' ... # Conflicts: # src/sdl12/i_cdmus.c # src/win32ce/win_cd.c	2018-08-21 15:40:54 +01:00
Monster Iestyn	9d3aad9036	Merge branch 'XPMupdate' into 'master' ... update XPM icon See merge request STJr/SRB2!267	2018-08-21 10:31:25 -04:00
Monster Iestyn	364339e1ce	Merge branch 'sdl_mixer_fixes' into 'master' ... SDL Mixer fixes Closes #31 See merge request STJr/SRB2!260	2018-08-16 16:57:14 -04:00
Steel Titanium	d9c7334dea	Fix white being treated as transparent.	2018-08-10 19:02:03 -04:00
Alam Ed Arias	3479310546	SDL: update IMG_xpm.c	2018-08-10 17:09:11 -04:00
Monster Iestyn	be5d0406bd	Merge branch 'public_next' ... # Conflicts: # src/hardware/hw_md2.c	2018-07-31 19:41:54 +01:00
Monster Iestyn	485d990949	Merge branch 'gme-lowvolume-fix' into 'master' ... GME low volume fix See merge request STJr/SRB2!248	2018-07-31 14:35:32 -04:00
Steel Titanium	c02ee9a502	Re-did this fix.	2018-07-28 01:58:25 -04:00
Monster Iestyn	6b1fa399dc	Use plain malloc instead of Z_Malloc to allocate sound buffers in mixer_sound.c's I_GetSfx. ... This should prevent I_FreeSfx making a mess of things later, hopefully.	2018-07-14 18:15:59 +01:00
Steel Titanium	46aa4c3503	Merge remote-tracking branch 'upstream/master' into gme-lowvolume-fix	2018-07-05 01:20:32 -04:00
Steel Titanium	8aee862ff8	Merge remote-tracking branch 'upstream/master' into gme-pause	2018-07-05 01:16:43 -04:00
Monster Iestyn	14d49b8bf1	Merge branch 'public_next' ... # Conflicts: # src/d_main.c # src/d_netfil.c # src/p_setup.c	2018-06-09 19:35:36 +01:00
Steel Titanium	77362c45cc	Fix pausing on gme	2018-06-03 18:15:20 -04:00
Steel Titanium	e394f7992d	Removed CONS_Printf line. That wasn't meant to be commited.	2018-05-29 22:12:36 -04:00
Steel Titanium	0248fcecd4	Some small change ... Really this is just to prevent the music end up being disorted at max volume	2018-05-29 20:31:28 -04:00
Monster Iestyn	41e9c20c04	Ignore mouse button events if the mouse's focus is not actually on the window at the moment. ... This should hopefully kill the F12 getting stuck issue once and for all.	2018-05-28 21:29:46 +01:00
Steel Titanium	0b6d6c3363	GME low volume fix	2018-05-24 16:24:09 -04:00
Monster Iestyn	a3b86a737e	Merge branch 'public_next' ... # Conflicts: # src/f_finale.c # src/hardware/hw_draw.c # src/hardware/hw_main.c # src/hardware/r_opengl/r_opengl.c # src/sdl12/hwsym_sdl.c # src/sdl12/i_video.c	2018-04-06 18:42:07 +01:00
Steel Titanium	d446f3420e	Merge remote-tracking branch 'upstream/master' into dedicated-nosoundinit	2018-04-03 16:16:20 -04:00
Sryder	f3d63b82ce	Revert "Fix screenshot functionality in fullscreen in SDL2" ... This reverts commit 121fcd8369. The reason I am reverting this is because the last commit actually fixes the *old* screenshot functionality, as the screen is being drawn back onto the buffer after they're swapped in the "real" size. Meaning the old function actually works perfectly fine now.	2018-03-18 18:33:53 +00:00
Sryder	a984d979d1	Fix wipes in low resolutions	2018-03-18 17:12:12 +00:00
Sryder	121fcd8369	Fix screenshot functionality in fullscreen in SDL2	2018-03-08 22:28:38 +00:00
Sryder	77af3a8f95	Optimise the screen texture setup for SDL2, Post-processor, and wipes. ... Only use glCopyTexImage2D when first creating the screen texture, use glCopyTexSubImage2D anytime after that as it does not define a new texture each time. Flushing of the screen textures has been implemented for when the screen size changes (so that the screen textures don't stay at a wrong size) and the game is closed, I believe they would leave a memory leak before.	2018-03-07 22:55:21 +00:00
Monster Iestyn	61923f3b1f	Merge branch 'public_next' ... # Conflicts: # src/sdl/i_system.c	2018-03-04 19:18:13 +00:00
Monster Iestyn	4a0305eec8	more I_GetFreeMem fixes: don't attempt to set *total to 0L if total itself is NULL	2018-02-23 20:40:19 +00:00
Monster Iestyn	1216c9da18	Use __linux__ instead of LINUX/LINUX64 ... Turns out compiling for Linux 32-bit using the Makefiles never actually defines LINUX! Apart from that, most of the existing Linux-specific code in SRB2's source code (except for tmap.s) actually uses __linux__ instead anyway	2018-02-23 20:21:16 +00:00
Steel Titanium	36d1259ceb	Removed some redundant checks	2018-02-17 00:37:17 -05:00
Monster Iestyn	03020036d4	Merge branch 'master' into file-loading-cleanup	2018-01-04 20:17:19 +00:00
Alam Ed Arias	5cce6101cc	Merge branch 'public_next' into private	2018-01-04 14:32:27 -05:00
Alam Ed Arias	82f2f2f2f9	SDL: disable check for noreturn	2018-01-04 14:29:29 -05:00
Monster Iestyn	8d07e2f8be	Merge branch 'master' into file-loading-cleanup	2018-01-02 18:46:02 +00:00
Alam Ed Arias	75abd428fc	MSVC2015: fixup	2018-01-02 13:22:10 -05:00
Monster Iestyn	61176ee736	Merge branch 'public_next' ... # Conflicts: # src/doomdef.h # src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj # src/win32/win_vid.c	2018-01-02 17:32:24 +00:00
Monster Iestyn	d937f6fc8b	Merge branch '2.1.20-preparation' into 'next' ... 2.1.20 preparation See merge request STJr/SRB2!215	2017-12-27 16:53:43 -05:00
Alam Ed Arias	a29203acd8	Disable win_dbg	2017-12-26 20:24:08 -05:00
Monster Iestyn	75bc76e9b4	Remove all traces of "srb2.wad" support, since it is no longer needed now that srb2.pk3 is the IWAD (...IPK3?). srb2.wad cannot exactly be a pk3 file after all. ... Additionally, rename any remaining "srb2.srb" to "srb2.pk3" in the main source code files. Not sure whether to bother dealing with srb2.srb/srb2.wad mentions in project files for now.	2017-12-07 18:26:12 +00:00
Monster Iestyn	7cb0138293	Change version number to 2.1.20	2017-11-08 15:06:42 +00:00
toaster	49a1266ccc	Merge branch 'sal-misc-stuff' into 'master' ... Sal misc stuff (state overwriting, gamepad tweaks) See merge request STJr/SRB2Internal!116	2017-11-02 16:35:12 -04:00
toasterbabe	ead8fd6bf7	Update some strings that say "joystick".	2017-10-30 23:23:52 +00:00