Monster Iestyn
|
9d3aad9036
|
Merge branch 'XPMupdate' into 'master'
update XPM icon
See merge request STJr/SRB2!267
|
2018-08-21 10:31:25 -04:00 |
|
Monster Iestyn
|
dcf843e485
|
Merge branch 'defaultsoundvol' into 'master'
Change default sound volume
See merge request STJr/SRB2!238
|
2018-08-20 09:41:04 -04:00 |
|
Monster Iestyn
|
febefd41ba
|
Fix glitches with flats visible when looking up/down in 1st person
|
2018-08-18 23:31:20 +01:00 |
|
Monster Iestyn
|
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 |
|
Alam Ed Arias
|
01a023206f
|
Merge branch 'master' into XPMupdate
|
2018-08-11 21:59:39 -04:00 |
|
Alam Ed Arias
|
7d3e4f729f
|
TravisCI: also remove gcc-6
|
2018-08-11 21:59:08 -04:00 |
|
Alam Ed Arias
|
b5cc11f7d8
|
TravisCI: gcc-4.9 is also gone
|
2018-08-11 21:44:07 -04:00 |
|
Alam Ed Arias
|
bb94d9fa3a
|
Merge branch 'master' into XPMupdate
|
2018-08-11 20:37:34 -04:00 |
|
Alam Ed Arias
|
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 |
|
Steel Titanium
|
d9c7334dea
|
Fix white being treated as transparent.
|
2018-08-10 19:02:03 -04:00 |
|
Alam Ed Arias
|
0575d2f1f9
|
TravisCI: remove gcc-5 test, gcc-5 package is gone
|
2018-08-10 17:16:26 -04:00 |
|
Alam Ed Arias
|
3479310546
|
SDL: update IMG_xpm.c
|
2018-08-10 17:09:11 -04:00 |
|
Monster Iestyn
|
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 |
|
toaster
|
145c050e14
|
...and R_DrawTranslucentSplat_8, even though it isn't used!
|
2018-08-09 17:08:20 +01:00 |
|
toaster
|
5daeaf529f
|
Apply the double-colormap ordering fix to R_DrawTiltedTranslucentSpan_8 as well.
|
2018-08-09 16:56:43 +01:00 |
|
Monster Iestyn
|
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 |
|
toaster
|
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 |
|
Monster Iestyn
|
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 |
|
Monster Iestyn
|
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 |
|
Monster Iestyn
|
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 |
|
Monster Iestyn
|
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 |
|
Steel Titanium
|
c02ee9a502
|
Re-did this fix.
|
2018-07-28 01:58:25 -04:00 |
|
Alam Ed Arias
|
1ee7eda0ad
|
Fixup PROFILEMODE
|
2018-07-20 17:35:18 -04:00 |
|
Monster Iestyn
|
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 |
|
Monster Iestyn
|
90ebce0557
|
Merge branch 'master' into fof-slope-skew-backport
|
2018-07-11 21:38:09 +01:00 |
|
Monster Iestyn
|
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 |
|
Monster Iestyn
|
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 |
|
colette
|
0a931a1364
|
Update f_finale.c
|
2018-07-07 20:20:46 -04:00 |
|
Alam Arias
|
a79b9a9127
|
Update m_misc.c
|
2018-07-07 20:41:11 +00:00 |
|
Alam Arias
|
7da6aca450
|
Update m_misc.c
|
2018-07-07 20:33:19 +00:00 |
|
Monster Iestyn
|
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 |
|
Monster Iestyn
|
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 |
|
MonsterIestyn
|
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 |
|
GoldenTails
|
761a221840
|
Merge remote-tracking branch 'STJrSRB2/master' into patch-1
|
2018-07-05 16:44:34 -05:00 |
|
Monster Iestyn
|
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 |
|
MonsterIestyn
|
d77ba1dab6
|
Merge pull request #264 from LJSonik/password-security-fix
Disable admin password by default
|
2018-07-05 20:16:19 +01:00 |
|
LJSonik
|
3b39b3b7c8
|
Merge branch 'master' into password-security-fix
|
2018-07-05 20:58:00 +02:00 |
|
MonsterIestyn
|
51c6e8d84c
|
Merge pull request #232 from LJSonik/minor-net-command-fixes
Minor net command fixes
|
2018-07-05 19:56:17 +01:00 |
|
LJSonik
|
bd6373bc86
|
Merge branch 'master' into minor-net-command-fixes
|
2018-07-05 20:00:38 +02:00 |
|
LJSonik
|
8e3c3a6f65
|
Merge branch 'master' into password-security-fix
|
2018-07-05 19:46:36 +02:00 |
|
Steel Titanium
|
39ebdb86b8
|
Merge remote-tracking branch 'upstream/master' into responsefile-fix
|
2018-07-05 01:24:51 -04:00 |
|
Steel Titanium
|
c8d0eb04f4
|
Merge remote-tracking branch 'upstream/master' into md2-smoother-interpolation
|
2018-07-05 01:23:56 -04:00 |
|
Steel Titanium
|
44144e379e
|
Merge remote-tracking branch 'upstream/master' into defaultsoundvol
|
2018-07-05 01:22:39 -04:00 |
|
Steel Titanium
|
c61035571b
|
Merge remote-tracking branch 'upstream/master' into md2-fopen-error
|
2018-07-05 01:21:09 -04:00 |
|
Steel Titanium
|
46aa4c3503
|
Merge remote-tracking branch 'upstream/master' into gme-lowvolume-fix
|
2018-07-05 01:20:32 -04:00 |
|
Steel Titanium
|
8aee862ff8
|
Merge remote-tracking branch 'upstream/master' into gme-pause
|
2018-07-05 01:16:43 -04:00 |
|
Monster Iestyn
|
82d953bbc2
|
Fixed the Lua crash exploit.
|
2018-07-04 20:15:36 +01:00 |
|
Monster Iestyn
|
03e2a2b445
|
Merge branch 'mp-menu-playername-fix' into 'master'
Multiplayer menu playername fix
See merge request STJr/SRB2!256
|
2018-06-27 10:01:39 -04:00 |
|
Monster Iestyn
|
d8a86a8d74
|
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
|
ac21a529c7
|
Merge branch 'master' into fof-slope-skew-backport
|
2018-06-26 20:11:08 +01:00 |
|