Commit graph

10850 commits

Author SHA1 Message Date
Nev3r
29f3d0e693 Fix smooth brain bruhments. 2020-07-31 22:38:37 +02:00
Nev3r
9189e4980d Fix the OpenGL FOF issue with a different approach. Not fond of it either but at least it works. 2020-07-31 14:55:26 +02:00
Nev3r
0c06840c6f Bring back P_FindSpecialLineFromTag() for backwards compatibility reasons; emulate the old taglist behavior for this function. 2020-07-29 17:26:43 +02:00
Nev3r
64130e32de Fix FOF intersections with multitags for the OpenGL in a kind of hacky way. 2020-07-29 14:53:27 +02:00
Nev3r
cc8beb4677 Fix FOF intersections in multitagging for the software renderer. 2020-07-29 14:52:21 +02:00
Nev3r
3854b56228 Merge branch 'next' into udmf-multitag
# Conflicts:
#	src/hardware/hw_main.c
2020-07-29 13:55:14 +02:00
Nev3r
69cdd00be6 Fix gl_linedef renaming which went off radars on the udmf branch 2020-07-28 20:39:11 +02:00
Nev3r
3d90a6aebe 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
0507119d50 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
0d14f7a570 Merge remote-tracking branch 'origin/master' into next 2020-07-25 17:45:20 -07:00
James R
db77fc5f00 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
6a247fb285 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
38d9fddac2 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
fcceaa02bd 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
329bd3e36a 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
ae72e35886 Merge remote-tracking branch 'origin/master' into next 2020-07-24 02:58:15 -07:00
James R
50479ffb74 Compiler error :V 2020-07-24 02:58:05 -07:00
James R
4931d82393 Update LATEST_GCC_VERSION too 2020-07-24 02:33:39 -07:00
James R
f939cf973b Add missing GCC version flags to the Makefile 2020-07-24 02:32:10 -07:00
James R
b6b1ce4766 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
2613a29396 Merge remote-tracking branch 'origin/next' into g_findmap-lua 2020-07-24 02:14:03 -07:00
James R
45c8f3a6cb 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
dd0c85b1ca 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
cfc659b175 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
077743dcce 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
b7f26c7f94 Fix OpenGL polyobject texture distortion 2020-07-23 20:51:05 +03:00
Hannu Hanhi
5e60111b9b Clamp light level for shaders. Fixes #194. 2020-07-23 19:05:17 +03:00
Hannu Hanhi
6fd250117a Don't discard zero alpha fog block fragments. Fixes #198. 2020-07-23 18:24:41 +03:00
James R
1f2697050b 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
905db8dc23 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
02922cb53d 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
5b2f0d9209 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
7432d65342 Parenthesis 2020-07-21 16:16:03 -07:00
James R
f6527e56b3 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
1afe2f4988 Fix crash if you start recording a replay and immediately close the game 2020-07-20 22:19:44 -04:00
lachwright
c6f752a394 Fix Super Sonic exploiting CA_FLOAT abilities 2020-07-21 03:50:26 +08:00
SwitchKaze
a9f19fbd18 Deny standard color accessibility changes 2020-07-20 12:06:57 -05:00
lachwright
c9d8fcc1cb Fix default NiGHTS skin brightness for non-super characters 2020-07-20 22:24:16 +08:00
James R
57f6d0b496 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
5044fba6ac Re-enable built-in color modification 2020-07-19 17:23:08 -05:00
Steel Titanium
058b41a834 Port netticbuffer from Kart 2020-07-19 15:24:27 -04:00
Steel Titanium
9630b9e244 Fix muspostbossname sometimes returning garbage. 2020-07-19 13:47:33 -04:00
James R
9841464e39 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
95a6e194e1 Merge remote-tracking branch 'origin/master' into next 2020-07-16 19:00:21 -07:00
James R
afe235a269 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
5c44774994 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
4184d83ef2 Fix skincolor-related memory leak 2020-07-14 17:09:31 -05:00
kaysrishaq
de3b0c36c8 minor lua fixes
minor lua fixes
2020-07-14 01:34:57 -04:00
kaysrishaq
a3558c29e3 Fix lib_freeslot 2020-07-13 18:56:07 -04:00
James R
f8b659e4bd Merge branch 'various-color-fixes' into 'next'
Various color fixes

See merge request STJr/SRB2!1060
2020-07-13 18:24:55 -04:00