247 commits

Author	SHA1	Message	Date
mazmazz	f4a574aba2	Support wide chars when searching for music tags (MP3)	2018-08-18 15:26:31 -04:00
mazmazz	6b35857ed1	I_GetMusicLength declarations for other interfaces	2018-08-18 14:18:49 -04:00
mazmazz	c6035f5956	I_GetMusicLength implementation	2018-08-18 14:18:29 -04:00
mazmazz	0254f4f368	Fix merge errors	2018-08-15 02:42:50 -04:00
mazmazz	e0ab8c1ed0	Fix #6 #7 SDL looping and counter bugs when looping=false ... # Conflicts: # src/sdl12/mixer_sound.c	2018-08-15 02:15:05 -04:00
mazmazz	11c6148d4b	SDL: Fix looping bug when looping=false; reset bytes counter when non-looping ... # Conflicts: # src/sdl12/mixer_sound.c	2018-08-15 02:11:17 -04:00
mazmazz	47423a69ed	Refactor to SetMusicPosition, GetMusicPosition ... # Conflicts: # src/lua_baselib.c # src/nds/i_sound.c # src/sdl12/mixer_sound.c # src/sdl12/sdl_sound.c # src/win32ce/win_snd.c	2018-08-15 02:10:46 -04:00
mazmazz	79531b9683	Another loop fix to resolve music_bytes not resetting on non-looppoint tracks ... # Conflicts: # src/sdl12/mixer_sound.c	2018-08-15 02:03:04 -04:00
mazmazz	2e9dba352a	SDL mixer: Fix no looping bug when changing song position ... # Conflicts: # src/sdl12/mixer_sound.c	2018-08-15 02:02:33 -04:00
mazmazz	eb52a14433	Implement I_MIDIPlaying, I_MusicPlaying, I_MusicPaused in other targets ... # Conflicts: # src/nds/i_sound.c # src/sdl12/sdl_sound.c # src/win32ce/win_snd.c	2018-08-15 01:59:01 -04:00
mazmazz	d39f804662	Use Mix_PausedMusic instead of our own music_paused flag in SDL2/SDL1.2 I_MusicPaused ... # Conflicts: # src/sdl12/mixer_sound.c	2018-08-15 01:55:49 -04:00
mazmazz	2483c11cc4	Implement I_MusicPaused in SDL2, SDL1.2, and FMOD; console and lua commands ... # Conflicts: # src/sdl12/mixer_sound.c	2018-08-15 01:55:03 -04:00
mazmazz	e4a6cb87d1	Fix SDL music counter pause issue	2018-08-15 01:54:17 -04:00
mazmazz	297a8d537a	Add S_MidiPlaying and S_MusicPlaying via I_MIDIPlaying and I_MusicPlaying ... # Conflicts: # src/sdl12/mixer_sound.c	2018-08-15 01:53:45 -04:00
mazmazz	d47d18998b	Add S_MidiPlaying and S_MusicPlaying via I_MIDIPlaying and I_MusicPlaying ... # Conflicts: # src/sdl12/mixer_sound.c	2018-08-15 01:43:51 -04:00
mazmazz	2cf364ab8b	Fix SDL music position getting; dummy out position methods for MIDI ... # Conflicts: # src/sdl/mixer_sound.c # src/sdl12/mixer_sound.c	2018-08-15 01:42:15 -04:00
mazmazz	aed388976c	SDL fix for I_SetSongPosition ... # Conflicts: # src/sdl12/mixer_sound.c	2018-08-15 01:40:54 -04:00
mazmazz	8981ef2cdc	Change get/set music position to UINT32 parameter, milliseconds ... # Conflicts: # src/d_netcmd.c # src/lua_baselib.c # src/nds/i_sound.c # src/sdl12/mixer_sound.c # src/sdl12/sdl_sound.c # src/win32ce/win_snd.c	2018-08-15 01:40:20 -04:00
mazmazz	a4f7b17389	Initial attempt for get/set song position ... * Declared I_SetSongPosition, I_GetSongPosition * Implemented S_PositionMusic and S_GetPositionMusic * Exposed in console TUNES and lua * Implemented set position in SDL, SDL12, WIN32 * Implemented get position in WIN32 # Conflicts: # src/nds/i_sound.c # src/sdl12/mixer_sound.c # src/sdl12/sdl_sound.c # src/win32ce/win_snd.c	2018-08-15 01:38:06 -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
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