mazmazz
0bccca1a8b
Assign mapthingnums to MT_FLICKY
...
* Type # 570-585
2018-08-09 00:17:46 -04:00
mazmazz
2526d2996e
FlickyFly: Configure gravity by MTF_AMBUSH
2018-08-09 00:13:08 -04:00
Monster Iestyn
fc68174e8b
Merge branch 'master' into next
2018-08-07 20:54:19 +01:00
Monster Iestyn
c666f5f182
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
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
8de4bb2be5
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
Monster Iestyn
dcd31eadf8
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
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
MascaraSnake
f0f8698d04
Reorganized the thing type numbers
2018-08-03 23:58:11 +02:00
Monster Iestyn
594cc953b5
Fix Cacolantern's preparing sound being played everywhere across the map
...
(or, in other words, fixing this to be the same as the equivalent state in the original SOC)
2018-08-02 16:15:30 +01:00
Monster Iestyn
502c80eaac
Merge branch 'master' into hardcoding-time-again
2018-08-02 16:04:54 +01:00
Monster Iestyn
1b6e85fda0
Merge branch 'pk3-wad-map-noreload-hotfix' into 'master'
...
PK3 WAD Map NoReload hotfix
See merge request STJr/SRB2Internal!148
2018-07-31 14:43:14 -04:00
Monster Iestyn
f6b8206660
Merge branch 'public_next'
...
# Conflicts:
# src/hardware/hw_md2.c
2018-07-31 19:41:54 +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
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
Monster Iestyn
dce1e1a103
Backport Kart Krew's fix for the 1px HOM with horizon lines
2018-07-08 22:30:37 +01: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
MonsterIestyn
a1ebb61b0a
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
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
MonsterIestyn
e536a5fb28
Merge pull request #264 from LJSonik/password-security-fix
...
Disable admin password by default
2018-07-05 20:16:19 +01:00
LJSonik
333a98fb59
Merge branch 'master' into password-security-fix
2018-07-05 20:58:00 +02:00
MonsterIestyn
b6881d75db
Merge pull request #232 from LJSonik/minor-net-command-fixes
...
Minor net command fixes
2018-07-05 19:56:17 +01: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
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
1c30318bd3
fix compiler errors (shadowed vars, comparisons between unsigned + signed, an unused function arg, and a non-static function with no prototype)
2018-07-02 21:03:04 +01:00
