Commit graph

3039 commits

Author SHA1 Message Date
Monster Iestyn
33e99a279e Merge branch 'deprecate-admin' into 'master'
Lua: Add deprecation warning to admin

See merge request STJr/SRB2!386
2018-12-16 17:14:32 -05:00
mazmazz
899120e475 Revert NMUSlist to original 2.1 2018-12-16 16:42:57 -05:00
mazmazz
046d36a657 Remove Kart entries from NMUSlist 2018-12-16 16:08:31 -05:00
mazmazz
6d94568f4b Hide kart-specific addons behavior behind USE_KART 2018-12-16 16:07:47 -05:00
TehRealSalt
cc22ef3f05 Add deprecation warning to admin 2018-12-16 16:05:18 -05:00
TehRealSalt
4ba23e1028 Expose R_TextureNumForName
Backport from SRB2Kart
2018-12-16 15:58:47 -05:00
TehRealSalt
d85c9b5abc Merge remote-tracking branch 'actualsrb2/next' into next 2018-12-16 15:55:28 -05:00
mazmazz
c3ff0b6d16 Uncomment Secrets menu toggle when exiting Addons 2018-12-16 15:52:01 -05:00
Alam Ed Arias
6e79722437 Fix float-equal warning in Win32 interface 2018-12-16 14:01:28 -05:00
Alam Ed Arias
11aef0b3f1 Merge branch 'master' into float_equal 2018-12-16 13:52:45 -05:00
Monster Iestyn
073ca10320 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
25e6d5388c merge conflict 2018-12-16 16:48:15 +01:00
Digiku
f855263f78 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
f0967520ed 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
37950341ec Merge remote-tracking branch 'public-gitlab/next' into addons-backport 2018-12-15 20:52:46 -05:00
mazmazz
0a3b3736bf Handle Kart-specific changes; add PK3 to exttable 2018-12-15 20:50:33 -05:00
mazmazz
b32f50648d 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
15d0673685 fix compiling for clang 2018-12-14 21:31:37 -05:00
Alam Ed Arias
78634679f1 fix compiling for MSVC 2018-12-14 20:42:37 -05:00
Alam Ed Arias
6fd66bdb49 Clear float equal warnings 2018-12-14 20:34:06 -05:00
Monster Iestyn
f4ce770c1c try out using offsetof for these three macros in d_clisrv.h 2018-12-14 23:56:11 +00:00
Monster Iestyn
e0079ea1a2 remove NearVertice (which was unused anyway), clean up maz's changes 2018-12-14 23:28:07 +00:00
mazmazz
de96fe8e7b Revert "compiler SSE tweak for 32-bit"
This reverts commit 09d9a555c6.
2018-12-14 16:47:38 -05:00
mazmazz
abae63a64b SameVertice floating point match; fixes 64-bit OGL holes 2018-12-14 16:47:24 -05:00
mazmazz
66efc7ea7f Merge remote-tracking branch 'public-gitlab/opengl-bsp-cleanup' into opengl-bsp-cleanup 2018-12-14 16:23:42 -05:00
Monster Iestyn
c1e0041a0b copy doom legacy's replacement for the den == 0.0 calc in fracdivline 2018-12-14 21:22:13 +00:00
mazmazz
09d9a555c6 compiler SSE tweak for 32-bit 2018-12-14 16:21:07 -05:00
mazmazz
fa3cc13024 Add symlink to debian package for /usr/games/srb2 2018-12-14 16:19:38 -05:00
Monster Iestyn
623d1574ce minor cleanup 2018-12-14 21:00:53 +00:00
MPC
9c04a066d9 Update r_plane.h 2018-12-14 15:49:32 -03:00
Monster Iestyn
b42c306ef3 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
52fd3dcbed split loading status code into a separate function 2018-12-14 18:11:30 +00:00
Monster Iestyn
02fc845a72 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
4089b6b8e9 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
3a125dbbd5 compare with actual doubles, not ints 2018-12-14 17:14:03 +00:00
Jimita
cf792ef4f3
Merge branch 'master' into the_second_remote_view_camera_fix 2018-12-14 15:09:24 -02:00
MPC
9c2197db17 Software plane fixes 2018-12-14 14:08:25 -03:00
Jimita
d70dbada1c
Merge branch 'master' into automap_fix 2018-12-14 15:07:53 -02:00
Monster Iestyn
ef6533fb83 Merge branch 'master' into next 2018-12-13 22:21:31 +00:00
Monster Iestyn
880c017f8f 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
ab7f0ca4fb 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
c57f548c7b 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
dc7992a815 R_Char2Frame special case for backslash: accept plus as substitute 2018-12-13 14:59:12 -05:00
mazmazz
d18b2cda59 Apply srb2home to saveconfig ONLY if srb2home isn't already there 2018-12-13 13:32:38 -05:00
mazmazz
93f7f0a8df Apply srb2home to debugfile 2018-12-13 13:23:09 -05:00
mazmazz
b1641aa8e9 Apply srb2home to SAVECONFIG 2018-12-13 13:17:56 -05:00
mazmazz
93eda4e7c9 EXEC: Search for CFG by file path 2018-12-13 13:11:25 -05:00
mazmazz
b84470ec51 Fix savegamename being improperly built due to missing null char after copying timeattackfolder 2018-12-13 12:01:07 -05:00
Jimita
e628d98f20
Update am_map.c 2018-12-12 19:59:21 -02:00
Jimita
a5874019cb
Update am_map.c 2018-12-12 19:57:52 -02:00