Commit graph

117 commits

Author SHA1 Message Date
James R
cd1ad44539 Console variables to toggle music/sound playing when the window is unfocused
Playsoundsifunfocused and playmusicifunfocused. "No" by default.
2019-10-23 17:21:09 -07:00
Jaime Passos
fa9cef1cc0 Merge remote-tracking branch 'origin/master' into openglskydome2 2019-09-27 22:47:10 -03:00
Steel Titanium
a18872652f Merge branch 'master' into internal-hotplug-stableid 2019-09-23 00:44:34 -04:00
Jaime Passos
5e1ebad9d3 sky barreling 2019-09-17 23:38:04 -03:00
Alam Ed Arias
aab58a4613 Revert "Merge branch 'gl_skydome' into 'master'"
This reverts merge request !326
2019-09-17 20:20:09 +00:00
Steel Titanium
5ba4e604b2 Merge branch 'newicon' into 'master'
New EXE icon

See merge request STJr/SRB2Internal!265
2019-09-12 14:05:32 -04:00
Steel Titanium
0b5bc8f64f Merge branch 'master' into internal-hotplug-stableid
Just merged in known working code, note that I haven't tested it, so I have no idea if it compiles still.
2019-09-08 01:55:36 -04:00
Jaime Passos
6573e94e3a PRBoom sky dome 2019-09-03 02:12:17 -03: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
Steel Titanium
2cccab7655 More icon stuff 2019-07-27 01:13:54 -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
Monster Iestyn
04a8c9a283 Merge branch 'public_next' 2019-05-16 15:58:17 +01:00
Monster Iestyn
c8e3748a1c Merge branch 'master' into next 2019-05-13 16:07:30 +01:00
wolfy852
93c706bfb8 Don't skip frames when connecting or paused 2019-05-08 09:39:45 -05:00
mazmazz
7f0b923107 Merge branch 'public-gl-next' into public-musicplus-jingle 2019-03-15 18:42:19 -04:00
james
e4a1470116 Set modifiers in a non-reactive manner 2019-01-17 16:47:01 -08:00
mazmazz
81352aece1 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
77a5a31135 Update capslock state on window re-focus 2018-12-26 15:49:57 -08:00
mazmazz
fe836e6109 Only SetWindowGrab if !disable_mouse; toggle cursor visibility 2018-12-23 22:09:16 -05:00
Steel Titanium
f1c4f3c772 Another attempt to lock the mouse 2018-12-23 18:54:15 -05:00
Steel Titanium
c98024aaf0 A more through out attempt to lock the mouse 2018-12-23 14:54:14 -05:00
Steel Titanium
350a6b1027 SDL:Auto grab input 2018-12-22 23:28:59 -05:00
mazmazz
5ed5d09950 Center window on current monitor during vidmode change 2018-12-22 01:43:58 -05:00
mazmazz
752fec8270 Fix menu where cv_usejoystick.value > I_JoyNum and selecting an unused controller and the "used!" prompt pops up erroneously 2018-12-14 05:57:10 -05:00
mazmazz
f7727fac5a Don't override an already-active controller
* Menu improvements to tell the user that they can't set a controller if it's already active
2018-12-14 05:02:41 -05:00
mazmazz
732956088a Lots of changes to better support hotplugging and unstable device indexes
* Don't save cv_usejoystick/2 because hotplugging changes can be made invalid by next run
* Properly set cv_usejoystick/2 for menu toggling
* Force-disable a player's joystick if setting another player's joystick to the same device
* Properly set cv_usejoystick/2 value of BOTH target player AND other players when hotplugging and unplugging
2018-12-14 03:58:07 -05:00
mazmazz
18287c09bb Properly handle unstable device indexes for hotplug 2018-12-14 01:45:18 -05:00
mazmazz
601535fe41 Attempt to handle unstable device IDs 2018-12-14 00:22:25 -05:00
mazmazz
651c99c5e3 Change joystick log messages to DBG_GAMELOGIC 2018-12-13 23:26:07 -05:00
mazmazz
85bfe704e2 Adjust SDL_JOYDEVICEREMOVED handler by checking the player's joy device explicitly 2018-12-13 22:26:13 -05:00
mazmazz
c4f035dfa9 Controller hotplugging by always keeping joy subsystem on (thanks WOLFS)
(with log messages)
2018-12-06 10:54:58 -05:00
Monster Iestyn
2d2088fd85 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
4c3bfe81bd 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
51ee510b85 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
7989e9a482 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
b34e8c5390 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
d7a0a3c94b Update copyright info on some files 2018-11-01 14:47:19 -04:00
Monster Iestyn
a0c822fec8 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
77381cd984 musicplus-jingle 2.2 -> 2.1 backport 2018-09-18 15:10:00 -04:00
mazmazz
af2496de9e Compile fixes 2018-09-14 10:58:41 -04:00
Monster Iestyn
3cce0b8a33 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
8f6d20d53c SDL: update IMG_xpm.c 2018-08-10 17:09:11 -04:00
Monster Iestyn
105eee7e0a 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
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
Monster Iestyn
43743722c7 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
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
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