Commit graph

442 commits

Author SHA1 Message Date
Sally Cochenour
1928721218 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
1c8c6387fc -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
mazmazz
aae6eb945d Merge remote-tracking branch 'kart-public-gl/next' into md3-vanilla-kart 2019-01-10 22:08:37 -05:00
wolfy852
6faae305e3 Merge remote-tracking branch 'remotes/public/next' into disable-xinput 2019-01-10 20:35:32 -06:00
wolfy852
fd99eb4f13 -noxinput command line parameter 2019-01-09 01:38:28 -06:00
Marco Z
74c57ad447 Kart Public Next merge 2019-01-08 18:43:49 -05:00
wolfy852
5c5e6a26dd 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
Arthur
2b8f49fd5e Removed gr_voodoocompatibility as even low-power mobile devices do not have this limitation
No longer using byte2float in DrawPolygon -- use the surface color data directly
Vertex Buffer Objects for non-interpolated model frames
Removed some old unused paletted texture stuff
2019-01-07 04:33:22 -05:00
Arthur
9617e604bb Removed all glBegin/glEnd references
MD2/MD3 now works, with the exception of WAD textures for some odd reason
2019-01-07 04:30:47 -05:00
Arthur
e67c1bee5d Common model format, with MD2/MD3 loading 2019-01-07 04:21:43 -05:00
SeventhSentinel
1d58c6b8c2 merge srb2 next 2019-01-05 15:59:23 -05:00
mazmazz
f0715d7af3 Updated Kart icons to higher res 2019-01-03 12:26:25 -05:00
mazmazz
e244b34093 Merge remote-tracking branch 'public-gl/master' into public-musicplus-core 2019-01-02 02:15:16 -05:00
Digiku
4560b4cb41 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
8dc37a850b Fix loop_point and song_length floating point comparisons 2019-01-01 10:47:16 -05:00
mazmazz
2326a58bc7 Merge remote-tracking branch 'public-gl/master' into public-musicplus-core 2019-01-01 10:41:40 -05:00
mazmazz
c520447f77 Merge remote-tracking branch 'kart-public-gl/next' into kart-public-travis-deployer 2018-12-31 18:20:04 -05:00
mazmazz
af519d3c07 Also change DEFAULTWADLOCATION to SRB2Kart in SDL2 2018-12-31 00:21:19 -05:00
mazmazz
c698eed16c Update SDL mac icon to Kart 2018-12-30 15:59:42 -05:00
mazmazz
337e0da8e4 Implement deployer scripts for Travis -- OSX and Linux package building [Kart merge] 2018-12-30 15:41:58 -05:00
Steel Titanium
07f1d495a4 Inclue PNG file 2018-12-29 23:10:45 -05:00
Steel Titanium
b6538c966e Update XPM icon 2018-12-29 22:52:04 -05:00
wolfy852
f5cd56004c JoyInfo1 -> JoyInfo
Don't you love it when typos ruin everything? :P
2018-12-29 13:55:58 -06:00
wolfy852
f2e5de3043 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
650df71cfc Reorganize some of the code for SDL_JOYDEVICEADDED events 2018-12-28 14:20:28 -06:00
Digiku
1517c16c4d 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
b5b9703b8b Make I_GetJoystickDeviceIndex account for controllers 3 and 4 2018-12-27 18:28:09 -06:00
wolfy852
f4d6a108d5 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
77a5a31135 Update capslock state on window re-focus 2018-12-26 15:49:57 -08:00
mazmazz
7deac7e603 Update code versions to 2.1.23 2018-12-26 16:31:43 -05:00
mazmazz
e40deb5443 Merge remote-tracking branch 'public-gl/master' into 2122-version 2018-12-24 17:31:03 -05: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
mazmazz
9c8487e8eb Merge remote-tracking branch 'public-gl/next' into 2122-version 2018-12-23 18:09:14 -05:00
Monster Iestyn
50710c3f10 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
c98024aaf0 A more through out attempt to lock the mouse 2018-12-23 14:54:14 -05:00
mazmazz
336c3d87c4 Merge remote-tracking branch 'public-gl/next' into 2122-version 2018-12-22 23:41:55 -05:00
Steel Titanium
350a6b1027 SDL:Auto grab input 2018-12-22 23:28:59 -05:00
Alam Ed Arias
7b2a7190dd Added static library of SDL2 and SDL2_mixer for ARM systems 2018-12-22 20:48:15 -05:00
Alam Ed Arias
e6cf509a84 More work to cleanup the ARM builds 2018-12-22 19:50:32 -05:00
mazmazz
5ed5d09950 Center window on current monitor during vidmode change 2018-12-22 01:43:58 -05:00
Alam Arias
5765b3e034 Added ARM/ARM64 to whole vc10 sln
Added ARM/ARM64 to zlib, libpng
Added ARM/ARM64 to srb2dd/srb2sdl
2018-12-21 16:47:10 -05:00
Digiku
7920dbe4a8 Merge branch 'float_equal' into 'master'
Clear Float equal warnings

See merge request STJr/SRB2!383
2018-12-20 16:58:37 -05:00
Digiku
f674a77a8e Merge branch 'cmake-dllpath-fix' into 'master'
Update CMake paths for Windows DLLs

See merge request STJr/SRB2!406
2018-12-20 16:53:06 -05:00
mazmazz
fb3fbf64bd Update CMake paths for Windows DLLs 2018-12-20 16:46:40 -05:00
mazmazz
8a6031ba01 Update code versions to 2.1.22 2018-12-20 02:35:27 -05:00
wolfy852
72619a3f71 Extend joystick hotplugging to players 3 and 4 2018-12-19 18:08:38 -06:00
wolfy852
39e01fe643 Revert GameController stuff 2018-12-19 13:11:30 -06:00
Alam Ed Arias
261e1e623c Clear float equal warnings 2018-12-14 20:34:06 -05:00
wolfy852
586c60a00d I_NumGameControllers, print GameController mapping, and store joystick GUID in JoyInfo 2018-12-14 12:49:07 -06:00