Commit graph

2090 commits

Author SHA1 Message Date
Monster Iestyn
877ac62895 Merge branch 'master' into next 2018-08-10 19:31:15 +01:00
toaster
dd31c02415 ...and R_DrawTranslucentSplat_8, even though it isn't used! 2018-08-09 17:08:20 +01:00
toaster
e11a734b2f Apply the double-colormap ordering fix to R_DrawTiltedTranslucentSpan_8 as well. 2018-08-09 16:56:43 +01:00
Monster Iestyn
fc68174e8b Merge branch 'master' into next 2018-08-07 20:54:19 +01:00
toaster
ca262dcbba Change the order of operations when applying transparency and colormap such that colormap isn't applied to the screen pixel twice (or, in the case of R_DrawTranslatedTranslucentColumn_8, thrice).
Please note I haven't touched the ASM equivalent, given as it's not actually used.
2018-08-07 19:12:10 +01:00
Monster Iestyn
73ca0b4814 Trim off any extra null bytes off the end of sector floorpic/ceiling when you access them in Lua 2018-08-06 22:37:44 +01:00
Monster Iestyn
9812df00d6 Merge branch 'master' into next 2018-08-06 15:15:35 +01:00
Monster Iestyn
2ad792ccd4 Rewrite archiving/unarchiving of Lua strings for netgames.
This now means:
* Lua strings longer than 1024 chars can now be read properly without awful crashes
* Lua strings with embedded zeros can be written/read without truncating anything (hopefully)
2018-08-05 22:02:20 +01:00
Monster Iestyn
ed6f6e3a75 Quick fix for LJ's password fix: don't check if password is set until we've confirmed that the receiving player is the server! 2018-08-05 20:17:30 +01:00
Monster Iestyn
10668f14b8 Merge branch 'master' into next 2018-07-31 19:36:30 +01:00
Monster Iestyn
e4f38995e7 Merge branch 'gme-lowvolume-fix' into 'master'
GME low volume fix

See merge request STJr/SRB2!248
2018-07-31 14:35:32 -04:00
Monster Iestyn
6bf3274452 Merge branch 'gme-pause' into 'master'
Fix pausing on gme

See merge request STJr/SRB2!251
2018-07-31 14:33:56 -04:00
Steel Titanium
d649700abf Re-did this fix. 2018-07-28 01:58:25 -04:00
Alam Ed Arias
6d9bf3c5b3 Merge branch 'master' into next 2018-07-20 17:35:53 -04:00
Alam Ed Arias
f80b4e18a2 Fixup PROFILEMODE 2018-07-20 17:35:18 -04:00
Monster Iestyn
594eb92bed Use plain malloc instead of Z_Malloc to allocate sound buffers in mixer_sound.c's I_GetSfx.
This should prevent I_FreeSfx making a mess of things later, hopefully.
2018-07-14 18:15:59 +01:00
Monster Iestyn
b86318a58e Merge branch 'master' into fof-slope-skew-backport 2018-07-11 21:38:09 +01:00
Monster Iestyn
107dbf7496 Merge branch 'master' into next 2018-07-11 21:37:23 +01:00
Monster Iestyn
1e4e0006cb Merge branch 'opengl-fof-lowerunpegged' into 'master'
OpenGL: FOF walls + Lower unpegged

See merge request STJr/SRB2!258
2018-07-11 16:36:26 -04:00
Monster Iestyn
e9339b6356 Merge branch 'master' into next 2018-07-11 21:18:39 +01:00
Monster Iestyn
c8aaad253d Merge branch 'opengl-projectsprite-fix' into 'master'
OpenGL HWR_ProjectSprite fix

See merge request STJr/SRB2!255
2018-07-11 16:15:42 -04:00
colette
639f0d335b Update f_finale.c 2018-07-07 20:20:46 -04:00
Alam Ed Arias
e219f92c6b Merge branch 'master' into next 2018-07-07 16:42:50 -04:00
Alam Arias
57f74bcc82 Update m_misc.c 2018-07-07 20:41:11 +00:00
Alam Arias
b4d84a171e Update m_misc.c 2018-07-07 20:33:19 +00:00
Monster Iestyn
71a40a8125 Merge branch 'md2-fopen-error' into 'master'
More helpful error messages

See merge request STJr/SRB2!243
2018-07-06 14:38:59 -04:00
Monster Iestyn
5758beb6b2 Merge branch 'md2-smoother-interpolation' into 'master'
Smoother MD2 interpolation

See merge request STJr/SRB2!224
2018-07-06 14:38:37 -04:00
GoldenTails
cdaadc0037 Merge remote-tracking branch 'STJrSRB2/master' into patch-1 2018-07-05 16:44:34 -05:00
Monster Iestyn
15812dfb30 Merge branch 'master' into next 2018-07-05 21:09:39 +01:00
Monster Iestyn
2004a852a6 Merge branch 'lua-exploit-fix' into 'master'
Lua exploit fix

See merge request STJr/SRB2!259
2018-07-05 16:08:08 -04:00
LJSonik
333a98fb59 Merge branch 'master' into password-security-fix 2018-07-05 20:58:00 +02:00
LJSonik
5c246dfcac Merge branch 'master' into minor-net-command-fixes 2018-07-05 20:00:38 +02:00
LJSonik
48a1e4b63c Merge branch 'master' into password-security-fix 2018-07-05 19:46:36 +02:00
Steel Titanium
2075925ac8 Merge remote-tracking branch 'upstream/master' into responsefile-fix 2018-07-05 01:24:51 -04:00
Steel Titanium
6d1a8703c7 Merge remote-tracking branch 'upstream/master' into md2-smoother-interpolation 2018-07-05 01:23:56 -04:00
Steel Titanium
deb0d72094 Merge remote-tracking branch 'upstream/master' into defaultsoundvol 2018-07-05 01:22:39 -04:00
Steel Titanium
d47e7014bc Merge remote-tracking branch 'upstream/master' into md2-fopen-error 2018-07-05 01:21:09 -04:00
Steel Titanium
b7776da524 Merge remote-tracking branch 'upstream/master' into gme-lowvolume-fix 2018-07-05 01:20:32 -04:00
Steel Titanium
e104e01057 Merge remote-tracking branch 'upstream/master' into gme-pause 2018-07-05 01:16:43 -04:00
Monster Iestyn
56ccf5ab7c Fixed the Lua crash exploit. 2018-07-04 20:15:36 +01:00
Monster Iestyn
28702eeed1 Merge branch 'master' into next 2018-06-27 15:06:12 +01:00
Monster Iestyn
e3616de7de Fix OpenGL completely missing the ability to alter FOF wall pegging by lower unpegged flag. Stupid OpenGL.
Sorry in advance Lat'!
2018-06-26 21:41:05 +01:00
Monster Iestyn
cb7a46a33d Merge branch 'master' into fof-slope-skew-backport 2018-06-26 20:11:08 +01:00
Monster Iestyn
4eb2ccfae9 fix the multiplayer menu not allowing the full max length for player names unlike the "name" console command 2018-06-26 17:46:04 +01:00
Steel Titanium
492eeb7009 Deallocate when I_Quit() is called instead. 2018-06-23 15:09:11 -04:00
Steel Titanium
78d4f90747 Remove free() call from the function 2018-06-23 14:39:26 -04:00
Monster Iestyn
609cc16b1e Fix HWR_ProjectSprite to check properly whether the displayed player's mobj or its subsector exists, to avoid a crash when checking for fake planes. (also use viewplayer since its available to use, silly hardware code)
Also tweaked a weird splitscreen check in HWR_DrawSpriteShadow; still investigating whether stplyr is ever not player 2 when it's player 2's view, but this looks better for now
2018-06-23 18:47:32 +01:00
Steel Titanium
68037d15a3 Update copyright 2018-06-17 00:09:35 -04:00
Steel Titanium
8c40c84bd8 Fix M_FindResponseFile returning garbage data 2018-06-16 23:44:28 -04:00
Louis-Antoine
65e9bed30f xd 2018-06-04 22:30:27 +02:00