Alam Arias
|
b6a917cda1
|
Added ARM/ARM64 to whole vc10 sln
Added ARM/ARM64 to zlib, libpng
Added ARM/ARM64 to srb2dd/srb2sdl
|
2018-12-21 16:47:10 -05:00 |
|
Digiku
|
58a2cec70f
|
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
|
50221c47e9
|
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
|
f405f1ae30
|
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
|
0519d8c52d
|
Update CMake paths for Windows DLLs
|
2018-12-20 16:46:40 -05:00 |
|
mazmazz
|
b57204fc12
|
Fix 2p control menu graying out
|
2018-12-20 16:38:58 -05:00 |
|
Digiku
|
25f0dc7eae
|
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
|
7f8d16d3cd
|
Add DEVELOP build flag to version string
|
2018-12-20 02:27:30 -05:00 |
|
Digiku
|
722ceb5285
|
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
|
78501dcd0c
|
Comment out stray PK3 blockmap message
|
2018-12-20 01:11:07 -05:00 |
|
Digiku
|
7982b1695a
|
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
|
96cad09db6
|
Change 0.05 to 0.05f
|
2018-12-18 16:59:59 -05:00 |
|
Azeonus
|
67cd6dcdd2
|
dispoffset OGL fix [by Azeonus]
|
2018-12-18 16:50:03 -05:00 |
|
Alam Arias
|
056cfe71a4
|
Merge pull request #373 from monster-psychic-cat/sw_planefixes
Software plane fixes
|
2018-12-18 14:02:21 -05:00 |
|
Alam Arias
|
e0eb64375a
|
Merge pull request #368 from monster-psychic-cat/automap_fix
Automap fix
|
2018-12-18 14:02:05 -05:00 |
|
Jimita
|
1d40676f3a
|
Merge branch 'master' into automap_fix
|
2018-12-17 17:46:29 -02:00 |
|
Jimita
|
f3956ffb4c
|
Merge branch 'master' into sw_planefixes
|
2018-12-17 17:45:36 -02:00 |
|
Monster Iestyn
|
6b1b11441d
|
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
|
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 |
|
TehRealSalt
|
cc22ef3f05
|
Add deprecation warning to admin
|
2018-12-16 16:05:18 -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 |
|
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 |
|
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
|
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 |
|
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
|
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
|
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
|
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 |
|