b63290211a
Merge branch 'master' into next
2018-08-16 22:04:00 +01:00
a4cfa9e82a
Merge branch 'lua-sector-names-fix' into 'next'
...
Lua sector names fix
See merge request STJr/SRB2!263
2018-08-16 16:57:41 -04:00
364339e1ce
Merge branch 'sdl_mixer_fixes' into 'master'
...
SDL Mixer fixes
Closes #31
See merge request STJr/SRB2!260
2018-08-16 16:57:14 -04:00
01a023206f
Merge branch 'master' into XPMupdate
2018-08-11 21:59:39 -04:00
7d3e4f729f
TravisCI: also remove gcc-6
2018-08-11 21:59:08 -04:00
b5cc11f7d8
TravisCI: gcc-4.9 is also gone
2018-08-11 21:44:07 -04:00
bb94d9fa3a
Merge branch 'master' into XPMupdate
2018-08-11 20:37:34 -04:00
6603f26772
Merge branch 'xpm_fix' into 'XPMupdate'
...
Fix white being treated as transparent.
See merge request STJr/SRB2!266
2018-08-11 20:36:57 -04:00
d9c7334dea
Fix white being treated as transparent.
2018-08-10 19:02:03 -04:00
0575d2f1f9
TravisCI: remove gcc-5 test, gcc-5 package is gone
2018-08-10 17:16:26 -04:00
3479310546
SDL: update IMG_xpm.c
2018-08-10 17:09:11 -04:00
7ee9c5b0f4
Merge branch 'master' into next
2018-08-10 19:31:15 +01:00
653fd3038d
Merge branch 'woops!_all_trans' into 'master'
...
Woops! All trans
See merge request STJr/SRB2!265
2018-08-10 14:27:45 -04:00
145c050e14
...and R_DrawTranslucentSplat_8, even though it isn't used!
2018-08-09 17:08:20 +01:00
5daeaf529f
Apply the double-colormap ordering fix to R_DrawTiltedTranslucentSpan_8 as well.
2018-08-09 16:56:43 +01:00
10a2ba8d39
Merge branch 'master' into next
2018-08-07 20:54:19 +01:00
c8ea5cfcaa
Merge branch 'transparency_i_hardly_knew_er' into 'master'
...
Transparency? I hardly knew 'er!
See merge request STJr/SRB2!264
2018-08-07 15:29:35 -04:00
ecc9ebe8c1
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
c703bc2fd7
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
02d2b61866
Merge branch 'master' into next
2018-08-06 15:15:35 +01:00
5943eb125e
Merge branch 'lua-archive-long-string-fix' into 'next'
...
Fixes for archiving/unarchiving Lua strings in netgames
See merge request STJr/SRB2!262
2018-08-06 10:12:59 -04:00
8d54d8adaa
Merge branch 'password-fix-hotfix' into 'master'
...
Password fix hotfix
See merge request STJr/SRB2!261
2018-08-06 09:43:54 -04:00
2738f3a537
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
8d622ff6f8
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
74646052b0
Merge branch 'master' into next
2018-07-31 19:36:30 +01:00
485d990949
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
16999b7080
Merge branch 'gme-pause' into 'master'
...
Fix pausing on gme
See merge request STJr/SRB2!251
2018-07-31 14:33:56 -04:00
c02ee9a502
Re-did this fix.
2018-07-28 01:58:25 -04:00
79e4c3760a
Merge branch 'master' into next
2018-07-20 17:35:53 -04:00
1ee7eda0ad
Fixup PROFILEMODE
2018-07-20 17:35:18 -04:00
6b1fa399dc
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
90ebce0557
Merge branch 'master' into fof-slope-skew-backport
2018-07-11 21:38:09 +01:00
a06ef26149
Merge branch 'master' into next
2018-07-11 21:37:23 +01:00
8e19611033
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
09ae0aae53
Merge branch 'master' into next
2018-07-11 21:18:39 +01:00
c127ea3ceb
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
0a931a1364
Update f_finale.c
2018-07-07 20:20:46 -04:00
17570c1ad6
Merge branch 'master' into next
2018-07-07 16:42:50 -04:00
a79b9a9127
Update m_misc.c
2018-07-07 20:41:11 +00:00
7da6aca450
Update m_misc.c
2018-07-07 20:33:19 +00:00
f1bba60373
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
130de10f97
Merge branch 'md2-smoother-interpolation' into 'master'
...
Smoother MD2 interpolation
See merge request STJr/SRB2!224
2018-07-06 14:38:37 -04:00
3e9103bec2
Merge pull request #252 from GoldenTails/patch-1
...
Fixed MD2 models not loading correctly on Linux
2018-07-06 19:12:21 +01:00
761a221840
Merge remote-tracking branch 'STJrSRB2/master' into patch-1
2018-07-05 16:44:34 -05:00
e5236c3137
Merge branch 'master' into next
2018-07-05 21:09:39 +01:00
8c56e39c18
Merge branch 'lua-exploit-fix' into 'master'
...
Lua exploit fix
See merge request STJr/SRB2!259
2018-07-05 16:08:08 -04:00
d77ba1dab6
Merge pull request #264 from LJSonik/password-security-fix
...
Disable admin password by default
2018-07-05 20:16:19 +01:00
3b39b3b7c8
Merge branch 'master' into password-security-fix
2018-07-05 20:58:00 +02:00
51c6e8d84c
Merge pull request #232 from LJSonik/minor-net-command-fixes
...
Minor net command fixes
2018-07-05 19:56:17 +01:00
bd6373bc86
Merge branch 'master' into minor-net-command-fixes
2018-07-05 20:00:38 +02:00
Monster Iestyn