203 commits

Author	SHA1	Message	Date
mazmazz	32ab93a012	Added I_GetMusicType and removed midimode variable: other targets ... (cherry picked from commit 14b393ab16736bb44dab6fd4a90b7bdd8ff782e0)	2018-09-14 09:55:45 -04:00
mazmazz	ff91315cbc	Added I_GetMusicType and removed midimode variable ... * Revised S_PlayMusic arguments * Now music plays again! (cherry picked from commit 55f3803e4b9f8104c90cc6c769d54121e5bac0b8)	2018-09-14 09:42:29 -04:00
mazmazz	5a4e6cf924	Loose ends other targets ... (cherry picked from commit 9a5fc5f66a31baf713c6f32f7a696b933da6907b)	2018-09-14 09:41:08 -04:00
Monster Iestyn	eb5b5300ab	Merge branch 'XPMupdate' into 'master' ... update XPM icon See merge request STJr/SRB2!267	2018-08-21 10:31:25 -04:00
Monster Iestyn	6797976531	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	cd790eca91	Fix white being treated as transparent.	2018-08-10 19:02:03 -04:00
Alam Ed Arias	8f6d20d53c	SDL: update IMG_xpm.c	2018-08-10 17:09:11 -04:00
Monster Iestyn	e4f38995e7	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	d649700abf	Re-did this fix.	2018-07-28 01:58:25 -04:00
Monster Iestyn	594eb92bed	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	b7776da524	Merge remote-tracking branch 'upstream/master' into gme-lowvolume-fix	2018-07-05 01:20:32 -04:00
Steel Titanium	e104e01057	Merge remote-tracking branch 'upstream/master' into gme-pause	2018-07-05 01:16:43 -04:00
Steel Titanium	61d8033d5e	Fix pausing on gme	2018-06-03 18:15:20 -04:00
Steel Titanium	884f10d8d2	Removed CONS_Printf line. That wasn't meant to be commited.	2018-05-29 22:12:36 -04:00
Steel Titanium	5f72975466	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	71fa00e423	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	528cb48d5d	GME low volume fix	2018-05-24 16:24:09 -04:00
Steel Titanium	bd928ddb80	Merge remote-tracking branch 'upstream/master' into dedicated-nosoundinit	2018-04-03 16:16:20 -04:00
Sryder	9c1bf9798a	Revert "Fix screenshot functionality in fullscreen in SDL2" ... This reverts commit 83d4f29367. 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	4e40a810f7	Fix wipes in low resolutions	2018-03-18 17:12:12 +00:00
Sryder	83d4f29367	Fix screenshot functionality in fullscreen in SDL2	2018-03-08 22:28:38 +00:00
Sryder	e6dff75aab	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	39949392ca	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	a4637a6dec	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	6d663fefa7	Removed some redundant checks	2018-02-17 00:37:17 -05:00
Alam Ed Arias	7c3c09b95d	SDL: disable check for noreturn	2018-01-04 14:29:29 -05:00
Monster Iestyn	83a8a77beb	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	f1968e5145	Disable win_dbg	2017-12-26 20:24:08 -05:00
Monster Iestyn	7cb0138293	Change version number to 2.1.20	2017-11-08 15:06:42 +00:00
Steel Titanium	799a819ee9	Merge remote-tracking branch 'upstream/master' into window_center_fix	2017-10-29 00:00:11 -04:00
Monster Iestyn	c90ddbca36	Merge branch 'makefile-ports-tweaks-cleanup-etc' into 'master' ... Makefile ports tweaks cleanup etc See merge request !211	2017-09-28 17:31:33 -04:00
Alam Ed Arias	2ccd397d11	Build: kill GCC 7's implicit-fallthrough warning	2017-09-28 09:39:47 -04:00
Monster Iestyn	b040113246	Removed the wrong endif by mistake	2017-09-16 20:59:35 +01:00
Monster Iestyn	a33bb70a0c	Removed all support for Dreamcast, XBox, PSP, PS3, GP2X, Wii, and WinCE from files in the sdl/ folder. If you wanted these ports, use the SDL 1.2 code in sdl12 ... Also removed GP2X setup from sdl/MakeNIX.cfg, use sdl12 for that too	2017-09-16 20:26:04 +01:00
Monster Iestyn	dcb23e01c0	SDL_INIT_NOPARACHUTE does nothing in SDL 2.0, so don't use it anymore	2017-09-15 21:22:28 +01:00
Monster Iestyn	5fb551dd75	Removed 1.2.x version checks in these files, SDL 2.0.x should always have these files	2017-09-15 17:15:06 +01:00
Monster Iestyn	d2a76ca269	Removed references to console ports and WinCE in sdl/Makefile.cfg	2017-09-15 17:12:53 +01:00
Steel Titanium	cf41a11770	Fix for window being offcenter	2017-09-11 16:36:30 -04:00
Monster Iestyn	36977a5eda	SDL_SetRelativeMouseMode(SDL_TRUE) already does what HalfWarpMouse does ... Also, don't post an ev_mouse event_t if not in relative mouse mode, so the camera doesn't jerk when the mouse enters the window	2017-08-22 22:53:18 +01:00
Monster Iestyn	821a1810f7	Moved lrounding of mouse motion events to the actual point an event is made ... Also did some cleanup and moving around, as well as adding comments	2017-08-21 21:38:29 +01:00
Monster Iestyn	10cbe2c82b	Turns out the issue was with fullscreen! All I have to do is factor in the resolution/real window size ratio apparently (which was already done before) ... Also changed movemousex/y to INT32	2017-08-19 22:54:30 +01:00
Monster Iestyn	758e9c4558	Merge all (relative) mouse motion events into one mouse event ... This fixes SDL2_RelMouse's weaker sensitivity for me on Windows (but apparently not for others??)	2017-08-19 21:39:04 +01:00
Monster Iestyn	2d661fef18	Turns out we don't need to use SDL_SetWindowTitle on its own, since SDL_CreateWindow already deals with the window title anyway. So I've disabled everything related to Impl_SetWindowName for now ... Also what were you thinking Fury?!? window shouldn't be NULL for SDL_SetWindowTitle, you backwards person you	2017-08-07 16:44:29 -04:00
Alam Ed Arias	35404be1e0	SDL: y input is flipped	2017-08-07 16:37:03 -04:00
Alam Ed Arias	c25b2eb37f	Merge remote-tracking branch 'origin/master' into SDL2_RelMouse	2017-08-07 16:33:39 -04:00
Alam Ed Arias	6be7693ecb	OpenGL: Load the GLU and OpenGL 1.3 multitexturing functions during runtime	2017-05-29 22:52:51 -04:00
Alam Ed Arias	877e9510f7	Update version number to v2.1.19	2017-05-26 21:38:49 -04:00
Monster Iestyn	17a06dd6c4	I_GetConsoleEvents: Split KEY_EVENT code into a function of its own, like with I_GetEvent's event types ... One benefit of this is that event_t data need only be created if KEY_EVENT is found, since the other event types never do anything anyway	2017-05-15 18:39:59 +01:00
Monster Iestyn	87085f2475	SDLSetMode: merge wasfullscreen/windowed mode code into one block	2017-05-15 16:35:32 +01:00
Monster Iestyn	a340f2c8ed	Impl_CreateWindow: re-use "flags" for SDL_RENDERER_* flags, remove unnecessary curly braces	2017-05-15 16:19:28 +01:00