Commit graph

2780 commits

Author SHA1 Message Date
mazmazz
5ed5d09950 Center window on current monitor during vidmode change 2018-12-22 01:43:58 -05:00
Digiku
7136112f9c Merge branch 'menu-screenshot-fix' into 'master'
Menu screenshot fix

Closes #45

See merge request STJr/SRB2!413
2018-12-22 00:40:18 -05:00
TehRealSalt
e5c308c1d7 Don't allow non-keyboard keys to screenshot/gif in menus 2018-12-22 00:39:32 -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
6a62edcae4 Merge branch 'menu-2pcontrols-fix' into 'master'
Fix 2p control menu graying out

See merge request STJr/SRB2!407
2018-12-20 16:54:52 -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
8207f126f4 Fix 2p control menu graying out 2018-12-20 16:38:58 -05:00
Digiku
f70a023bce Merge branch 'version-string-develop' into 'master'
Add DEVELOP build flag to version string

See merge request STJr/SRB2!401
2018-12-20 02:28:21 -05:00
mazmazz
861805ca0f Add DEVELOP build flag to version string 2018-12-20 02:27:30 -05:00
Digiku
bf5a27477e Merge branch 'pk3-stray-blockmap-msg' into 'master'
Comment out stray PK3 blockmap message

See merge request STJr/SRB2!399
2018-12-20 01:11:44 -05:00
mazmazz
8fb1453633 Comment out stray PK3 blockmap message 2018-12-20 01:11:07 -05:00
Digiku
91bed58e6a Merge branch 'ogl-zfighting-fix' into 'master'
OpenGL z-fighting fix [by Azeonus]

Closes #43

See merge request STJr/SRB2!395
2018-12-19 13:05:04 -05:00
mazmazz
7c5e508f40 Change 0.05 to 0.05f 2018-12-18 16:59:59 -05:00
Azeonus
ae590779f9 dispoffset OGL fix [by Azeonus] 2018-12-18 16:50:03 -05:00
Alam Arias
69398d8910 Merge pull request #373 from monster-psychic-cat/sw_planefixes
Software plane fixes
2018-12-18 14:02:21 -05:00
Alam Arias
09f41f0e68 Merge pull request #368 from monster-psychic-cat/automap_fix
Automap fix
2018-12-18 14:02:05 -05:00
Jimita
97cc111f3e Merge branch 'master' into automap_fix 2018-12-17 17:46:29 -02:00
Jimita
91037eae12 Merge branch 'master' into sw_planefixes 2018-12-17 17:45:36 -02: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
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
TehRealSalt
6b1746b67b Add deprecation warning to admin 2018-12-16 16:05:18 -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
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
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
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
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
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
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
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