fickleheart
f909a055d8
Merge remote-tracking branch 'remotes/james/unpause-resume-sounds' into version-prep
2019-03-17 16:36:52 -05:00
James R
70f40d54cb
Resume sounds on unpausing after a window re-focus
2019-03-16 15:50:16 -07:00
fickleheart
c30c3f7a3a
Merge remote-tracking branch 'remotes/upstream/next' into HEAD
2019-03-11 21:53:53 -05:00
James R
0f9648eac0
Miscellaneous window de-focus options
...
Music pausing is now optional.
Sounds may be paused--on by default.
The game itself being paused in off-line mode is now optional.
(showfocuslost now loads from config.)
2019-03-11 14:57:11 -07:00
Alam Arias
e2a5e8a18d
Merge branch 'master' into next
2019-03-11 10:01:57 -04:00
Alam Arias
b1ec0442da
Merge branch 'master' into ping-stuff-take2
2019-03-09 18:05:30 -05:00
Steel Titanium
77649ef6d1
Always return false instead.
2019-03-08 18:51:55 -05:00
Steel Titanium
0e2cefe251
Properly comment out the function
2019-03-07 18:52:27 -05:00
Steel Titanium
7731fe8c24
Fix unused function error
2019-03-07 18:20:57 -05:00
Steel Titanium
dc1786203d
Merge branch 'master' into dontskipframes
2019-03-05 22:11:00 -05:00
Steel Titanium
0f51f3b7e3
Don't skip frames in software mode
2019-03-05 22:07:53 -05:00
Alam Arias
24ae6107cf
Exported SDL_icon.xpm as srb2icon.png
2019-03-02 13:26:17 -05:00
Alam Arias
3d8e25e440
Merge remote-tracking branch 'upstream/master' into upstream-merge
2019-03-01 11:10:57 -05:00
wolfy852
cbb3145236
Stop Linux servers from hanging every 34 hours
...
This drastically increases the amount of time Linux servers can stay up for before hanging.
2019-02-28 18:51:57 -06:00
wolfs
5620d0188e
Merge branch 'apng' into 'master'
...
Support aPNG in new versions of libpng
See merge request KartKrew/Kart-Public!63
2019-02-28 12:00:58 -08:00
Monster Iestyn
d76e946b3e
Merge branch 'sdl-new-windowicon' into 'master'
...
SDL:Update XPM icon
See merge request STJr/SRB2!441
2019-02-27 13:34:24 -05:00
wolfy852
1fb65c72ff
Reorganization + kill old interfaces
2019-02-19 18:52:57 -06:00
Latapostrophe
24516cbf84
Move ping display in i_video for consistency with showfps display
2019-02-16 13:38:50 +01:00
Steel Titanium
bcd5176ad1
Update project files
2019-02-14 21:32:57 -05:00
james
9eec83da95
Support CMake for apng
2019-02-12 17:01:27 -08:00
Alam Arias
dc5024f94c
remove whitespaces
2019-02-05 15:42:37 -05:00
Sally Cochenour
1e61cc6152
Better cpusleep
...
- Default to 1, which means potential for a 1-frame loss every once in a while but no longer a complete cpu hog
- New minimum is 0, since -1 just did the exact same thing as 0.
2019-01-28 14:12:08 -05:00
wolfy852
a8e0805261
-nohidapi parameter
...
Should fix problems where Switch Pro controllers suddenly had their mappings changed. Does not recognize controllers connected before game launch. Make sure to replug your controller after the game launches if using this param.
2019-01-10 23:12:06 -06:00
wolfy852
7a50ea2554
Merge remote-tracking branch 'remotes/public/next' into disable-xinput
2019-01-10 20:35:32 -06:00
wolfy852
5e682d612f
-noxinput command line parameter
2019-01-09 01:38:28 -06:00
Marco Z
7806c43ecf
Kart Public Next merge
2019-01-08 18:43:49 -05:00
wolfy852
ad01dcc5ac
Merge remote-tracking branch 'remotes/public/next' into gamepad-tweaks
...
# Conflicts:
# CMakeLists.txt
# appveyor.yml
# src/command.c
# src/command.h
# src/d_clisrv.c
# src/d_netcmd.c
# src/dehacked.c
# src/doomdef.h
# src/hu_stuff.c
# src/m_misc.c
2019-01-08 16:32:24 -06:00
SeventhSentinel
73542c008c
merge srb2 next
2019-01-05 15:59:23 -05:00
mazmazz
5f632d9b3c
Updated Kart icons to higher res
2019-01-03 12:26:25 -05:00
Digiku
5278d1ca20
Merge branch 'caps-lock-consistency-fix' into 'master'
...
Update capslock state on window re-focus
See merge request STJr/SRB2!436
2019-01-01 15:05:20 -05:00
mazmazz
97295bb285
Merge remote-tracking branch 'kart-public-gl/next' into kart-public-travis-deployer
2018-12-31 18:20:04 -05:00
mazmazz
07e7dba730
Also change DEFAULTWADLOCATION to SRB2Kart in SDL2
2018-12-31 00:21:19 -05:00
mazmazz
346e11d6da
Update SDL mac icon to Kart
2018-12-30 15:59:42 -05:00
mazmazz
e2f5c99217
Implement deployer scripts for Travis -- OSX and Linux package building [Kart merge]
2018-12-30 15:41:58 -05:00
Steel Titanium
0ebe5b258c
Inclue PNG file
2018-12-29 23:10:45 -05:00
Steel Titanium
a7b96ab83d
Update XPM icon
2018-12-29 22:52:04 -05:00
wolfy852
7091cb1cca
JoyInfo1 -> JoyInfo
...
Don't you love it when typos ruin everything? :P
2018-12-29 13:55:58 -06:00
wolfy852
7a9e6161ae
Check joystick IDs against all other players [by Digiku]
...
Untested on my end, but conceptually sound.
2018-12-29 02:33:53 -06:00
wolfy852
266e255bb6
Reorganize some of the code for SDL_JOYDEVICEADDED events
2018-12-28 14:20:28 -06:00
Digiku
80e30c6aaa
Merge branch 'MSVC-ARM' into 'master'
...
ARM and ARM64 support with MSVC toolchain
See merge request STJr/SRB2!412
2018-12-28 01:05:40 -05:00
wolfy852
eb729c55e4
Make I_GetJoystickDeviceIndex account for controllers 3 and 4
2018-12-27 18:28:09 -06:00
wolfy852
203050dc04
Merge remote-tracking branch 'remotes/SRB2/vanilla-hotplug-stableid' into gamepad-tweaks
...
# Conflicts:
# src/command.c
# src/command.h
# src/g_game.c
# src/m_menu.c
# src/sdl/i_system.c
# src/sdl/i_video.c
# src/sdl/sdlmain.h
This is NOT just a normal merge commit. I have adjusted the hotplugging code from stableid to account for the last two players, and also removed new 2.1 additions that were deemed irrelevant to Kart.
2018-12-27 16:21:51 -06:00
james
0b857f127f
Update capslock state on window re-focus
2018-12-26 15:49:57 -08:00
mazmazz
894c139bf1
Update code versions to 2.1.23
2018-12-26 16:31:43 -05:00
mazmazz
7fc79f0b88
Merge remote-tracking branch 'public-gl/master' into 2122-version
2018-12-24 17:31:03 -05: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
mazmazz
c0a0c5ac5d
Merge remote-tracking branch 'public-gl/next' into 2122-version
2018-12-23 18:09:14 -05:00
Monster Iestyn
2d675750cf
fix inconsistent "tabbing" in the VS project files from when I added in lua_blockmaplib.c
2018-12-23 21:52:49 +00:00
Steel Titanium
40a037f603
A more through out attempt to lock the mouse
2018-12-23 14:54:14 -05:00
