Monster Iestyn
a054c5b7fe
Merge branch 'opengl-bsp-cleanup' into 'master'
...
Opengl BSP cleanup and fixes
See merge request STJr/SRB2!382
2018-12-16 12:51:38 -05:00
Latapostrophe
34f13e9f20
merge conflict
2018-12-16 16:48:15 +01:00
Digiku
c25451e167
Merge branch 'linux-symlink' into 'master'
...
Add symlink to debian package for /usr/games/srb2
See merge request STJr/SRB2!385
2018-12-15 22:17:04 -05:00
mazmazz
6bdff246a8
Compile fixes; enable PK3 support in addons menu
...
* Add missing vars highlightflags, recommendedflags, warningflags from Kart
* V_GetStringColormap() use vanilla behavior because Kart behavior glitches for us
* V_GetStringColormap() made non-static
2018-12-15 21:44:39 -05:00
mazmazz
b6d1cca4da
Merge remote-tracking branch 'public-gitlab/next' into addons-backport
2018-12-15 20:52:46 -05:00
mazmazz
a283d229b4
Handle Kart-specific changes; add PK3 to exttable
2018-12-15 20:50:33 -05:00
mazmazz
ede6b183b1
Merge branch 'addons_menu' into 'master'
...
Addons menu
See merge request KartKrew/Kart!8
2018-12-15 20:46:42 -05:00
Sal
82b06e2e85
Merge branch 'stupid-orbinaut-bullshit' into 'master'
...
Fix stupid Orbinaut bullshit
See merge request KartKrew/Kart!120
2018-12-15 19:10:41 -05:00
Alam Ed Arias
facba6c04d
fix compiling for clang
2018-12-14 21:31:37 -05:00
Alam Ed Arias
386f9d4e54
fix compiling for MSVC
2018-12-14 20:42:37 -05:00
Alam Ed Arias
261e1e623c
Clear float equal warnings
2018-12-14 20:34:06 -05:00
Monster Iestyn
62bd57e633
try out using offsetof for these three macros in d_clisrv.h
2018-12-14 23:56:11 +00:00
Monster Iestyn
8ff705eff0
remove NearVertice (which was unused anyway), clean up maz's changes
2018-12-14 23:28:07 +00:00
mazmazz
c74abd05c9
Revert "compiler SSE tweak for 32-bit"
...
This reverts commit 6588231a16
2018-12-14 16:47:38 -05:00
mazmazz
a91e84c9ef
SameVertice floating point match; fixes 64-bit OGL holes
2018-12-14 16:47:24 -05:00
mazmazz
c1e5b72ee0
Merge remote-tracking branch 'public-gitlab/opengl-bsp-cleanup' into opengl-bsp-cleanup
2018-12-14 16:23:42 -05:00
Monster Iestyn
f2acd58af3
copy doom legacy's replacement for the den == 0.0 calc in fracdivline
2018-12-14 21:22:13 +00:00
mazmazz
6588231a16
compiler SSE tweak for 32-bit
2018-12-14 16:21:07 -05:00
mazmazz
a0aa9bb466
Add symlink to debian package for /usr/games/srb2
2018-12-14 16:19:38 -05:00
Monster Iestyn
ad87418a1e
minor cleanup
2018-12-14 21:00:53 +00:00
MPC
18b09c4417
Update r_plane.h
2018-12-14 15:49:32 -03:00
wolfy852
586c60a00d
I_NumGameControllers, print GameController mapping, and store joystick GUID in JoyInfo
2018-12-14 12:49:07 -06:00
Monster Iestyn
c787353df2
remove code from SearchDivline that was disabled ...and doesn't seem to exist anymore anyway
2018-12-14 18:14:08 +00:00
Monster Iestyn
2ab24111ba
split loading status code into a separate function
2018-12-14 18:11:30 +00:00
Monster Iestyn
7169b8841a
Make sure nptfront is explicitly > 0, so we don't alloc a poly for negative number points at all
2018-12-14 18:01:18 +00:00
Monster Iestyn
acb1e37729
use continue if NULL instead of a big if block if ...not NULL
...
also, SplitPoly returns if ps < 0, so there's no need to check for ps >= 0 afterwards
2018-12-14 18:00:08 +00:00
wolfy852
ac62575896
Print GameController info when detected, use proper 360 controller defaults for triggers
2018-12-14 11:50:53 -06:00
Monster Iestyn
b3eba87d71
compare with actual doubles, not ints
2018-12-14 17:14:03 +00:00
Jimita
be7cbfb4d8
Merge branch 'master' into the_second_remote_view_camera_fix
2018-12-14 15:09:24 -02:00
MPC
9372baf427
Software plane fixes
2018-12-14 14:08:25 -03:00
Jimita
834639248f
Merge branch 'master' into automap_fix
2018-12-14 15:07:53 -02:00
mazmazz
f90348ac05
Better I_InitJoystick log message
2018-12-14 06:14:21 -05:00
mazmazz
1d2512e4c0
Allow use_joystick/2 to be saved once again
2018-12-14 06:07:20 -05:00
mazmazz
0545c52970
Fix cv_usejoystick being reset to None when cv_usejoystick was > NumJoys and changing to already-used joystick
2018-12-14 06:05:31 -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
da69539718
Display "joystick used" prompt correctly if setting use_joystick from an old value > I_NumJoys()
2018-12-14 05:31:47 -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
d2e39c660e
Improve hotplug edge case with changing device indexes; return proper joy_open output on error
2018-12-13 23:52:04 -05:00
mazmazz
651c99c5e3
Change joystick log messages to DBG_GAMELOGIC
2018-12-13 23:26:07 -05:00
mazmazz
1cdbe75183
Handle unstable device index when hotplugging controller
2018-12-13 23:09:05 -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
7dd6dba27e
Merge tag 'SRB2_release_2.1.21' into vanilla-hotplug
2018-12-13 22:16:48 -05:00
Monster Iestyn
dcf65e0f72
Merge branch 'master' into next
2018-12-13 22:21:31 +00:00
Monster Iestyn
2ca1cd415e
Merge branch 'cfg-srb2home-fix' into 'master'
...
Apply srb2home path to EXEC, SAVECONFIG, and debugfile
See merge request STJr/SRB2!379
2018-12-13 16:16:52 -05:00
Digiku
db7d712ebe
Merge branch 'awayviewmobj-sanity-checks' into 'next'
...
Awayviewmobj sanity checks
See merge request STJr/SRB2!377
2018-12-13 16:11:27 -05:00
Digiku
dbaa3aaf3b
Merge branch 'savegamename-fix' into 'master'
...
Fix savegamename being improperly built
See merge request STJr/SRB2!378
2018-12-13 16:11:13 -05:00
mazmazz
bde0d7ac3a
R_Char2Frame special case for backslash: accept plus as substitute
2018-12-13 14:59:12 -05:00
