Monster Iestyn
a1bc5852a2
Merge branch 'master' into next
2018-12-17 17:34:41 +00:00
mazmazz
a51130a8b9
Better rewrite for addons draw adjustment
2018-12-17 10:59:27 -05:00
TehRealSalt
4d8fe70aa7
Undo 53dfb4c8
2018-12-16 21:36:54 -05:00
TehRealSalt
f5a0d52749
Merge remote-tracking branch 'upstream/next' into kart-luatextures-backport
2018-12-16 21:22:06 -05:00
TehRealSalt
079c0ec709
Save override for level header
...
Kind of like 2.2's, but with backwards-compatability with 2.1
2018-12-16 20:09:59 -05:00
mazmazz
e88db2e2b1
Use labs for long value
2018-12-16 19:47:02 -05:00
mazmazz
8bd3f38dd2
Remove FIXUPO0 GCC pragma
2018-12-16 19:39:16 -05:00
mazmazz
492d1ba749
Wstrict-overflow adjustment
2018-12-16 19:38:46 -05:00
TehRealSalt
672b948b92
Foolish
2018-12-16 18:19:53 -05:00
TehRealSalt
fad18c421e
2.2 camera changes backport
...
- Very slightly less claustrophobic camera defaults
- Changed camera settings are saved
- Camera distance increases relatively with splitscreen & analog mode.
These changes are kind of debatable because them not saving was an intentional decision initially, and the camera being farther out could potentially clip more geometry where it previously didn't... still, thought I'd open this for consideration
2018-12-16 18:18:59 -05:00
Alam Ed Arias
53dfb4c8bc
Merge branch 'revert-d92cec1c' into 'next'
...
Revert "Merge branch 'kart-luatextures-backport' into 'next'"
See merge request STJr/SRB2!390
2018-12-16 17:57:53 -05:00
Alam Ed Arias
8a47cf93f6
Revert "Merge branch 'kart-luatextures-backport' into 'next'"
...
This reverts merge request !387
2018-12-16 22:57:39 +00:00
TehRealSalt
edd3259cf4
2.2 backport of jump/spin axes
...
Needs the config default-changing shenanigans done still, not sure how to tackle that yet. Now the game is TOTALLY playable from a fresh install if you just plug in a controller.
2018-12-16 17:45:49 -05:00
Monster Iestyn
94b00b6b67
Merge branch 'sdl-sound-fix' into 'master'
...
SDL: Force use DirectSound driver to fix wrong-pitch sound effects
See merge request STJr/SRB2!375
2018-12-16 17:16:49 -05:00
Monster Iestyn
d92cec1c78
Merge branch 'kart-luatextures-backport' into 'next'
...
Lua: Expose R_TextureNumForName
See merge request STJr/SRB2!387
2018-12-16 17:15:31 -05:00
Monster Iestyn
ca4cbd9c30
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
9e466c4e77
Revert NMUSlist to original 2.1
2018-12-16 16:42:57 -05:00
mazmazz
a0f2e8eb94
Remove Kart entries from NMUSlist
2018-12-16 16:08:31 -05:00
mazmazz
77456cd593
Hide kart-specific addons behavior behind USE_KART
2018-12-16 16:07:47 -05:00
TehRealSalt
6b1746b67b
Add deprecation warning to admin
2018-12-16 16:05:18 -05:00
TehRealSalt
dde29e47c5
Expose R_TextureNumForName
...
Backport from SRB2Kart
2018-12-16 15:58:47 -05:00
TehRealSalt
af28215de9
Merge remote-tracking branch 'actualsrb2/next' into next
2018-12-16 15:55:28 -05:00
mazmazz
2237aa1d07
Uncomment Secrets menu toggle when exiting Addons
2018-12-16 15:52:01 -05:00
Alam Ed Arias
f43dc96d73
Fix float-equal warning in Win32 interface
2018-12-16 14:01:28 -05:00
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
