Commit graph

3536 commits

Author SHA1 Message Date
mazmazz
205678cb9a NiGHTS drill meter penalty when mashing jump button
Thanks Inuyasha (KS) for code
2018-08-09 22:15:13 -04:00
mazmazz
9d8af5da01 Snappier NiGHTS pickup attraction
* Old attraction is still used for non-NiGHTS players due to a momentum bug. The old way is good enough to sidestep the bug.
* Thanks Inuyasha (KS) for original code 🐶
2018-08-09 21:24:01 -04:00
mazmazz
3463ec212a A_FlickyCenter implementation - now Flickies can be attracted to players!
* Changed default movement to attraction, vs. aimless
* Flickies spawned from this will always have the FLICKY_CENTER mobj as its target
    * Use P_IsFlickyCenter to identify FLICKY_CENTER mobjs versus players
* FLICKY_CENTER mobj tracer points to the spawned Flicky
* Thanks toaster for the original code~~
2018-08-09 17:28:37 -04:00
toaster
dd31c02415 ...and R_DrawTranslucentSplat_8, even though it isn't used! 2018-08-09 17:08:20 +01:00
mazmazz
ebb150a05e MT_FLICKY_x_CENTER defs 2018-08-09 12:08:06 -04:00
toaster
e11a734b2f Apply the double-colormap ordering fix to R_DrawTiltedTranslucentSpan_8 as well. 2018-08-09 16:56:43 +01:00
mazmazz
7b539b51f2 Choose Flicky Fish Color by Thing Parameter 2018-08-09 04:19:18 -04:00
mazmazz
ae321f78ac Make standing flickies bounce if MTF_AMBUSH and not MTF_OBJECTSPECIAL 2018-08-09 02:55:22 -04:00
mazmazz
4d1d40aa5d Flicky stand animation fixes 2018-08-09 02:27:25 -04:00
mazmazz
999eff8eba Flicky stand implementation by MTF_AMBUSH
* MTF_OBJECTSPECIAL: Set no gravity for flicky
2018-08-09 02:08:25 -04:00
mazmazz
304fdea710 Flicky stand states 2018-08-09 01:44:21 -04:00
mazmazz
41a438ece1 Mapthingnums for MT_SECRETFLICKYies 2018-08-09 01:01:20 -04:00
mazmazz
baa16c55fb Fix FlickyFly momentum on MTF_OBJECTSPECIAL 2018-08-09 00:57:35 -04:00
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
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
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
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