99 commits

Author	SHA1	Message	Date
toaster	603d5805f7	Revert "Merge branch 'musicplus-aug2019-b' into 'master'" ... This reverts commit 56bfdb7113, reversing changes made to c29cfbef9b.	2019-08-04 11:32:55 +01:00
mazmazz	923dc34215	Merge branch 'public-notpublic-musicplus-jingle' into internal-musicplus-jingle	2019-06-29 18:33:45 -04:00
mazmazz	6244489fd0	Merge branch 'public-musicplus-jingle' into public-notpublic-musicplus-jingle	2019-06-29 18:10:44 -04:00
Monster Iestyn	66bc287688	Merge branch 'public_next'	2019-05-16 15:58:17 +01:00
Monster Iestyn	600a373739	Merge branch 'master' into next	2019-05-13 16:07:30 +01:00
wolfy852	8f05d75926	Don't skip frames when connecting or paused	2019-05-08 09:39:45 -05:00
mazmazz	8317155c40	Merge branch 'public-gl-next' into public-musicplus-jingle	2019-03-15 18:42:19 -04:00
james	356249dade	Set modifiers in a non-reactive manner	2019-01-17 16:47:01 -08:00
mazmazz	075f28b7c8	WIP 20190101 merge ... d_netcmd.c filesrch.c m_menu.c p_setup.c p_spec.c r_data.c r_main.c r_things.c w_wad.c w_wad.h	2019-01-02 01:09:15 -05:00
james	0b857f127f	Update capslock state on window re-focus	2018-12-26 15:49:57 -08:00
mazmazz	ed410575d6	Only SetWindowGrab if !disable_mouse; toggle cursor visibility	2018-12-23 22:09:16 -05:00
Steel Titanium	46d1a866d8	Another attempt to lock the mouse	2018-12-23 18:54:15 -05:00
Steel Titanium	40a037f603	A more through out attempt to lock the mouse	2018-12-23 14:54:14 -05:00
Steel Titanium	66e13cf1cc	SDL:Auto grab input	2018-12-22 23:28:59 -05:00
mazmazz	8707b2f40a	Center window on current monitor during vidmode change	2018-12-22 01:43:58 -05:00
Monster Iestyn	ce4e63a366	Miserable half-attempt to support hats in I_GetEvent, I've disabled it for now since I couldn't really figure out how to pull this off ...yet	2018-12-02 17:12:05 +00:00
Monster Iestyn	e4f157786c	Merge branch 'public_next' ... # Conflicts: # src/Makefile # src/doomtype.h # src/hardware/hw_clip.c # src/hardware/hw_main.c # src/sdl12/sdl_sound.c	2018-11-10 19:18:34 +00:00
Monster Iestyn	51df32dd3d	Merge branch 'gcc-compiling-cleanup' into 'master' ... Compiling cleanup and fixes See merge request STJr/SRB2!311	2018-11-10 13:56:17 -05:00
Monster Iestyn	268bde3fdf	Merge branch 'public_next' ... # Conflicts: # src/d_netcmd.c # src/d_netcmd.h # src/dehacked.c # src/g_game.h # src/hardware/hw_draw.c # src/hardware/hw_main.c # src/lua_baselib.c # src/lua_hook.h # src/lua_hooklib.c # src/lua_hudlib.c # src/lua_libs.h # src/lua_maplib.c # src/lua_script.c # src/m_misc.h # src/p_mobj.c # src/s_sound.c # src/sdl12/mixer_sound.c # src/w_wad.c	2018-11-10 15:41:57 +00:00
Monster Iestyn	0bdbdd1b1e	Remove FUNCMATH from functions with a void return value or args, or examine variables other than their args (which could be modified)	2018-11-08 16:26:55 +00:00
Steel Titanium	5a0cfc10f4	Update copyright info on some files	2018-11-01 14:47:19 -04:00
Monster Iestyn	b5c4b476a6	Merge branch 'public_next' ... # Conflicts: # src/d_main.c # src/m_menu.c # src/s_sound.c # src/sdl/sdl_sound.c	2018-10-20 15:31:48 +01:00
mazmazz	c60d61a493	musicplus-jingle 2.2 -> 2.1 backport	2018-09-18 15:10:00 -04:00
mazmazz	4b1bc53db1	Compile fixes	2018-09-14 10:58:41 -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
Alam Ed Arias	3479310546	SDL: update IMG_xpm.c	2018-08-10 17:09:11 -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
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
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
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	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	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
Steel Titanium	799a819ee9	Merge remote-tracking branch 'upstream/master' into window_center_fix	2017-10-29 00:00:11 -04:00
Monster Iestyn	de4ea022c0	Merge branch 'public_next'	2017-09-29 17:23:47 +01: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	f1a347e55f	Merge branch 'public_next' into master	2017-09-28 11:01:20 -04:00
Alam Ed Arias	2ccd397d11	Build: kill GCC 7's implicit-fallthrough warning	2017-09-28 09:39:47 -04: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
Steel Titanium	cf41a11770	Fix for window being offcenter	2017-09-11 16:36:30 -04:00
Monster Iestyn	d65e23f3ec	Merge branch 'public_next'	2017-09-04 20:19:47 +01: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
Monster Iestyn	c653289121	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-06-25 20:22:01 +01:00
Monster Iestyn	21d29c8550	Merge branch 'public_next'	2017-05-17 16:19:01 +01:00