mazmazz
|
8586643467
|
Merge remote-tracking branch 'public-gl/master' into undo-old-side-discolor-fix
|
2018-12-25 00:09:24 -05:00 |
|
mazmazz
|
a7ac8179f5
|
Revert "Merge branch 'side-discolor-fix' into 'master'"
This reverts commit f81144d7b1, reversing
changes made to c24d860eea.
|
2018-12-24 20:58:26 -05:00 |
|
Digiku
|
90e673a487
|
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
|
59ac969594
|
Define EPSILONs only if not already defined
Fixes OSX buildbot
|
2018-12-24 20:36:28 -05:00 |
|
mazmazz
|
52b6810ee1
|
Remove log message
|
2018-12-24 20:33:59 -05:00 |
|
mazmazz
|
7c3dcd2bf9
|
Use DBL_EPSILON for colormap comparison
|
2018-12-24 20:22:10 -05:00 |
|
mazmazz
|
732b9a66ca
|
Fix float comparison for colormap maskamt
|
2018-12-24 19:58:05 -05:00 |
|
Alam Ed Arias
|
008fecbba7
|
TravisCI: GCC 8.x needs to pass
|
2018-12-24 19:10:29 -05:00 |
|
Digiku
|
f81144d7b1
|
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
|
23b27f5566
|
cleanup
|
2018-12-24 17:21:33 -05:00 |
|
Digiku
|
c24d860eea
|
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
|
29308db913
|
Merge branch 'master' into sdl-autograb
|
2018-12-23 22:35:44 -05:00 |
|
Steel Titanium
|
7bf9636d45
|
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
|
fe836e6109
|
Only SetWindowGrab if !disable_mouse; toggle cursor visibility
|
2018-12-23 22:09:16 -05:00 |
|
Steel Titanium
|
f1c4f3c772
|
Another attempt to lock the mouse
|
2018-12-23 18:54:15 -05:00 |
|
Digiku
|
8d05795f65
|
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
|
ff2ec801bc
|
Clear all control keys before loading defaults in LoadConfig
|
2018-12-23 14:59:26 -05:00 |
|
Steel Titanium
|
c98024aaf0
|
A more through out attempt to lock the mouse
|
2018-12-23 14:54:14 -05:00 |
|
Steel Titanium
|
350a6b1027
|
SDL:Auto grab input
|
2018-12-22 23:28:59 -05:00 |
|
Digiku
|
b9e37d1ed0
|
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
|
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 |
|
mazmazz
|
e7cc04a46e
|
Reset default controls for LOADCONFIG command
|
2018-12-20 10:13:43 -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 |
|