Digiku
|
cb42702e6b
|
Merge branch 'float-compare-colormap-fix' into 'master'
Fix float comparison for colormap maskamt
See merge request STJr/SRB2!428
|
2018-12-24 20:55:06 -05:00 |
|
mazmazz
|
10a3e3fec9
|
Define EPSILONs only if not already defined
Fixes OSX buildbot
|
2018-12-24 20:36:28 -05:00 |
|
mazmazz
|
c65f44e805
|
Remove log message
|
2018-12-24 20:33:59 -05:00 |
|
mazmazz
|
e9e5128754
|
Use DBL_EPSILON for colormap comparison
|
2018-12-24 20:22:10 -05:00 |
|
mazmazz
|
58728ec358
|
Fix float comparison for colormap maskamt
|
2018-12-24 19:58:05 -05:00 |
|
Alam Ed Arias
|
89133160ec
|
TravisCI: GCC 8.x needs to pass
|
2018-12-24 19:10:29 -05:00 |
|
Digiku
|
e721a3d882
|
Merge branch 'side-discolor-fix' into 'master'
Fix colormap bleeding onto sides [by Jimita]
See merge request STJr/SRB2!427
|
2018-12-24 17:33:34 -05:00 |
|
Jimita
|
4c6334f459
|
cleanup
|
2018-12-24 17:21:33 -05:00 |
|
Digiku
|
4656a0d02c
|
Merge branch 'sdl-autograb' into 'master'
SDL:Auto grab input
Closes #46
See merge request STJr/SRB2!416
|
2018-12-24 17:04:27 -05:00 |
|
Steel Titanium
|
cb13ace77e
|
Merge branch 'master' into sdl-autograb
|
2018-12-23 22:35:44 -05:00 |
|
Steel Titanium
|
8044e2a7f6
|
Merge branch 'sdl-autograb-revise' into 'sdl-autograb'
AutoGrab changes
See merge request SteelTitanium/SRB2!3
|
2018-12-23 22:32:51 -05:00 |
|
mazmazz
|
ed410575d6
|
Only SetWindowGrab if !disable_mouse; toggle cursor visibility
|
2018-12-23 22:09:16 -05:00 |
|
Steel Titanium
|
46d1a866d8
|
Another attempt to lock the mouse
|
2018-12-23 18:54:15 -05:00 |
|
Digiku
|
402860dc06
|
Merge branch 'loadconfig-defaultcontrols' into 'master'
Reset default controls for LOADCONFIG command
See merge request STJr/SRB2!403
|
2018-12-23 17:14:34 -05:00 |
|
mazmazz
|
f55623ef9c
|
Clear all control keys before loading defaults in LoadConfig
|
2018-12-23 14:59:26 -05:00 |
|
Steel Titanium
|
40a037f603
|
A more through out attempt to lock the mouse
|
2018-12-23 14:54:14 -05:00 |
|
Steel Titanium
|
66e13cf1cc
|
SDL:Auto grab input
|
2018-12-22 23:28:59 -05:00 |
|
Digiku
|
974a8e3e2b
|
Merge branch 'sdl-vidmode-display-fix' into 'master'
SDL: Center window on current monitor during vidmode change
Closes #47
See merge request STJr/SRB2!415
|
2018-12-22 09:06:55 -05:00 |
|
mazmazz
|
8707b2f40a
|
Center window on current monitor during vidmode change
|
2018-12-22 01:43:58 -05:00 |
|
Digiku
|
66dc5a8712
|
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
|
1291d35e08
|
Don't allow non-keyboard keys to screenshot/gif in menus
|
2018-12-22 00:39:32 -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 |
|
mazmazz
|
71da6836c0
|
Reset default controls for LOADCONFIG command
|
2018-12-20 10:13:43 -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 |
|