Commit graph

2116 commits

Author SHA1 Message Date
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
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
TehRealSalt
6b1746b67b Add deprecation warning to admin 2018-12-16 16:05:18 -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
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
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
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
mazmazz
72e55b4623 Windows string adjustment 2018-12-06 15:42:58 -05:00
mazmazz
dac15d2283 Adjust version strings 2018-12-06 15:39:19 -05:00
Digiku
31b88c5195 Merge branch 'execversion' into '21-version'
Block previous versions' config defaults with EXECVERSION consvar

See merge request STJr/SRB2!371
2018-12-06 12:41:20 -05:00
mazmazz
439fff4402 Register execversion and remove CV_SAVE because we write manually 2018-12-06 12:28:30 -05:00
mazmazz
49d899ffea a stray if block 2018-12-06 12:03:53 -05:00
mazmazz
86b3221986 alwaysfreelook -> alwaysmlook string 2018-12-06 12:02:45 -05:00
mazmazz
fd6f5a9fbd Add alwaysfreelook2 and mousemove2 to config versioning
* Change alwaysfreelook2 to be consistent with alwaysfreelook (the only one that wasn't the same)
2018-12-06 11:59:34 -05:00
mazmazz
5e6e0d539b Use proper DD define for use_joystick 2018-12-06 06:50:18 -05:00
mazmazz
e8584f2535 Implement EXECVERSION consvar to invalidate previous versions' default config values 2018-12-06 06:28:34 -05:00
mazmazz
d488dd0763 Move joyaxis_fire default to right trigger 2018-12-06 05:55:56 -05:00
mazmazz
0e0ccf2ae6 Change 2p controller defaults 2018-12-06 05:26:28 -05:00