Nev3r
|
586dc0b631
|
Merge branch 'next' into udmf-fofs-mkii
|
2020-07-30 12:39:25 +02:00 |
|
Nev3r
|
f791c1b4ec
|
Fix gl_linedef renaming which went off radars on the udmf branch
|
2020-07-28 20:39:11 +02:00 |
|
Nev3r
|
6dfe236602
|
Merge branch 'udmf-next' into 'next'
Merge udmf-next into next
See merge request STJr/SRB2!1075
|
2020-07-28 14:03:59 -04:00 |
|
James R
|
fb6bac46ec
|
Merge branch 'extras-credits-unskippable' into 'next'
Fix Credits sequence from Extras being unskippable
See merge request STJr/SRB2!1091
|
2020-07-27 19:35:14 -04:00 |
|
James R
|
2aa2eaf939
|
Merge remote-tracking branch 'origin/master' into next
|
2020-07-25 17:45:20 -07:00 |
|
James R
|
ec8fddf70c
|
Merge branch 'missing-gcc-flags' into 'master'
Add missing GCC version flags to the Makefile
See merge request STJr/SRB2!1087
|
2020-07-25 20:31:49 -04:00 |
|
James R
|
1bdcb8d92f
|
Merge branch 'titlecard-clowning' into 'next'
Stretch the fallback titlecard to the screen
See merge request STJr/SRB2!1019
|
2020-07-25 20:21:08 -04:00 |
|
James R
|
63b15f784f
|
Merge branch 'musicpref-var' into 'next'
Console variable to select music preference
See merge request STJr/SRB2!939
|
2020-07-25 20:14:22 -04:00 |
|
James R
|
005e7ce793
|
Merge branch 'g_findmap-lua' into 'next'
G_FindMap and G_FindMapByNameOrCode for Lua
See merge request STJr/SRB2!693
|
2020-07-25 20:06:44 -04:00 |
|
James R
|
d90fe93982
|
Fix Credits sequence from Extras being unskippable
This is because a server is not started before going to the credits. I'm way
too stupid/lazy to try starting a server, so have a special case!
|
2020-07-24 03:58:38 -07:00 |
|
James R
|
484b8e2c06
|
Merge remote-tracking branch 'origin/master' into next
|
2020-07-24 02:58:15 -07:00 |
|
James R
|
e47fbe7dd9
|
Compiler error :V
|
2020-07-24 02:58:05 -07:00 |
|
James R
|
4059c6a654
|
Update LATEST_GCC_VERSION too
|
2020-07-24 02:33:39 -07:00 |
|
James R
|
00943e9e82
|
Add missing GCC version flags to the Makefile
|
2020-07-24 02:32:10 -07:00 |
|
James R
|
d013dd0d9c
|
Merge branch 'masterserver' into 'master'
Fix the Master Server so it works
See merge request STJr/SRB2!856
|
2020-07-24 05:20:30 -04:00 |
|
James R
|
6fd9e25b11
|
Merge remote-tracking branch 'origin/next' into g_findmap-lua
|
2020-07-24 02:14:03 -07:00 |
|
James R
|
28931b90dc
|
Merge branch 'ogl-polyobject-tex-fix' into 'next'
Fix OpenGL polyobject texture distortion
See merge request STJr/SRB2!1086
|
2020-07-24 04:49:25 -04:00 |
|
James R
|
932bf9b20e
|
Merge branch 'ogl-shader-light-clamp' into 'next'
Clamp light level for shaders. Fixes #194.
Closes #194
See merge request STJr/SRB2!1085
|
2020-07-24 04:47:57 -04:00 |
|
James R
|
b45bd6990e
|
Merge branch 'ogl-fog-block-fix' into 'next'
Don't discard zero alpha fog block fragments. Fixes #198.
Closes #198
See merge request STJr/SRB2!1084
|
2020-07-24 04:45:50 -04:00 |
|
James R
|
47581607ef
|
Merge branch 'netticbuffer-port' into 'next'
Port netticbuffer from Kart
See merge request STJr/SRB2!1077
|
2020-07-24 04:45:08 -04:00 |
|
Hannu Hanhi
|
e331c9d18e
|
Fix OpenGL polyobject texture distortion
|
2020-07-23 20:51:05 +03:00 |
|
Hannu Hanhi
|
e4d6e92f37
|
Clamp light level for shaders. Fixes #194.
|
2020-07-23 19:05:17 +03:00 |
|
Hannu Hanhi
|
80172ee932
|
Don't discard zero alpha fog block fragments. Fixes #198.
|
2020-07-23 18:24:41 +03:00 |
|
James R
|
c944d3adf4
|
Merge branch 'fix-nights-fullbright' into 'next'
NiGHTS fullbright fixes
See merge request STJr/SRB2!1080
|
2020-07-22 22:15:07 -04:00 |
|
James R
|
4d16f16dab
|
Merge branch 'fix-superfloat' into 'next'
Fix Super Sonic exploiting CA_FLOAT abilities
See merge request STJr/SRB2!1081
|
2020-07-22 22:13:51 -04:00 |
|
James R
|
8d60579e6c
|
Merge branch 'demo-quit-crash-fix' into 'next'
Fix crash if you start recording a replay and immediately close the game
See merge request STJr/SRB2!1082
|
2020-07-22 22:11:03 -04:00 |
|
James R
|
57d7c1ab12
|
Merge branch 'next-compile-now' into 'next'
AND OR PARENTHESIS
See merge request STJr/SRB2!1083
|
2020-07-22 22:08:31 -04:00 |
|
James R
|
196beead7d
|
Parenthesis
|
2020-07-21 16:16:03 -07:00 |
|
James R
|
735942a437
|
Merge branch 'next-lc-uint16' into 'next'
Allow modification of built-in skincolors
See merge request STJr/SRB2!1078
|
2020-07-21 17:56:12 -04:00 |
|
Steel Titanium
|
76702d6712
|
Fix crash if you start recording a replay and immediately close the game
|
2020-07-20 22:19:44 -04:00 |
|
lachwright
|
242e128aa0
|
Fix Super Sonic exploiting CA_FLOAT abilities
|
2020-07-21 03:50:26 +08:00 |
|
SwitchKaze
|
5332fff540
|
Deny standard color accessibility changes
|
2020-07-20 12:06:57 -05:00 |
|
lachwright
|
cea3f64c88
|
Fix default NiGHTS skin brightness for non-super characters
|
2020-07-20 22:24:16 +08:00 |
|
James R
|
a8e16638ee
|
Merge branch 'muspostbossname-fix' into 'next'
Fix muspostbossname sometimes returning garbage.
Closes #197
See merge request STJr/SRB2!1076
|
2020-07-20 04:47:40 -04:00 |
|
SwitchKaze
|
ee9c146b5d
|
Re-enable built-in color modification
|
2020-07-19 17:23:08 -05:00 |
|
Steel Titanium
|
e9a03401cb
|
Port netticbuffer from Kart
|
2020-07-19 15:24:27 -04:00 |
|
Steel Titanium
|
05ac0fc7ea
|
Fix muspostbossname sometimes returning garbage.
|
2020-07-19 13:47:33 -04:00 |
|
James R
|
7c2f81e4ed
|
Merge branch 'next-lc-uint16' into 'next'
Fix skincolor-related memory leak
See merge request STJr/SRB2!1066
|
2020-07-16 22:01:07 -04:00 |
|
James R
|
fa90ff6bae
|
Merge remote-tracking branch 'origin/master' into next
|
2020-07-16 19:00:21 -07:00 |
|
James R
|
d6b831053f
|
Merge branch 'fix-lib_freeslot' into 'next'
Fix lib_freeslot
See merge request STJr/SRB2!1064
|
2020-07-14 18:32:10 -04:00 |
|
James R
|
30d27ded6e
|
Merge branch 'minor-lua-fixes' into 'next'
Minor Lua Fixes (CONS_Printf and mobj_t.valid)
See merge request STJr/SRB2!1065
|
2020-07-14 18:32:00 -04:00 |
|
SwitchKaze
|
734033250d
|
Fix skincolor-related memory leak
|
2020-07-14 17:09:31 -05:00 |
|
kaysrishaq
|
7f9175033d
|
minor lua fixes
minor lua fixes
|
2020-07-14 01:34:57 -04:00 |
|
kaysrishaq
|
29a116ba81
|
Fix lib_freeslot
|
2020-07-13 18:56:07 -04:00 |
|
James R
|
34bd0d9fe7
|
Merge branch 'various-color-fixes' into 'next'
Various color fixes
See merge request STJr/SRB2!1060
|
2020-07-13 18:24:55 -04:00 |
|
kaysrishaq
|
f541c37ebc
|
Fix formatting
PREFAVAILABLE -> S_PrefAvailable
move declarations to top of blocks
|
2020-07-13 15:16:49 -04:00 |
|
James R
|
3253ffbbc8
|
Merge branch 'cmake-adjustments' into 'master'
CMAKE additions: SDL Mixer X, *.debug adjustments, CPACK adjustments, CCACHE
See merge request STJr/SRB2!992
|
2020-07-13 12:40:13 -04:00 |
|
Nev3r
|
ac8590132b
|
Add a provisional GZDoom-esque 3D floor setup for the sake of immediate UDB usability.
|
2020-07-13 11:09:19 +02:00 |
|
Nev3r
|
d1db5ebf56
|
Merge branch 'udmf-next' into udmf-fofs-mkii
|
2020-07-13 09:34:32 +02:00 |
|
GoldenTails
|
a02306b674
|
Fix small inconsistency
|
2020-07-12 19:38:38 -05:00 |
|