Commit graph

3030 commits

Author SHA1 Message Date
Alam Ed Arias
8742596a05 Merge branch 'master' into float_equal 2018-12-16 13:52:45 -05:00
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
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
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
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
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
mazmazz
a396ad5240 Apply srb2home to saveconfig ONLY if srb2home isn't already there 2018-12-13 13:32:38 -05:00
mazmazz
17766f3130 Apply srb2home to debugfile 2018-12-13 13:23:09 -05:00
mazmazz
2406de3167 Apply srb2home to SAVECONFIG 2018-12-13 13:17:56 -05:00
mazmazz
56e54a38cc EXEC: Search for CFG by file path 2018-12-13 13:11:25 -05:00
mazmazz
847350d664 Fix savegamename being improperly built due to missing null char after copying timeattackfolder 2018-12-13 12:01:07 -05:00
Jimita
c29ce1158a Update am_map.c 2018-12-12 19:59:21 -02:00
Jimita
0557123032 Update am_map.c 2018-12-12 19:57:52 -02:00
MPC
91abc8ae9c Remove MINIAUTOMAP code 2018-12-12 18:53:13 -03:00
MPC
3e70ce2565 Fix the automap 2018-12-12 18:01:52 -03:00
Jimita
ad32af337b Update p_user.c 2018-12-12 13:09:47 -02:00
Jimita
194aa8d5da Merge branch 'master' into the_second_remote_view_camera_fix 2018-12-11 21:52:28 -02:00
MPC
a1b1d91acb Fix remote viewpoint cameras for real
I'm so sorry
2018-12-11 20:48:45 -03:00
Monster Iestyn
ee474bab23 Add some checks to prevent invalid awayviewmobjs from crashing the game. Not fullproof but at the least the P_CameraThinker crash no longer happens 2018-12-11 18:39:58 +00:00
MPC
dd78224528 Large room fix 2018-12-09 19:34:17 -03:00
mazmazz
e1c0a7158b Indentation 2018-12-08 14:10:56 -05:00
mazmazz
71aa97fc22 Force directsound to fix wrong-pitch sound effects 2018-12-08 14:05:58 -05:00