Commit graph

10142 commits

Author SHA1 Message Date
Monster Iestyn
3a7417c8fe Merge branch 'master' into next 2020-06-06 20:35:48 +01:00
Monster Iestyn
b493010b5e Merge branch 'cppcheck-fixes' into 'master'
Cppcheck fixes

See merge request STJr/SRB2!967
2020-06-06 15:28:48 -04:00
Monster Iestyn
fedbac6f64 Merge branch 'master' into next 2020-06-06 17:39:43 +01:00
Monster Iestyn
7dd0ba0f45 added liolib.c to the VC10 project files, since it was missing from them 2020-06-06 17:38:35 +01:00
MascaraSnake
5d99f42a2a Merge branch 'translucent-splat-planes' into 'next'
Allow transparent parts in translucent FOF and PolyObject planes

See merge request STJr/SRB2!978
2020-06-06 04:35:06 -04:00
Monster Iestyn
7302fde015 Merge branch 'polyrotate-turnobjs-sync' into 'next'
Sync turnobjs for polyrotate_t thinkers in netgames

See merge request STJr/SRB2!979
2020-06-04 17:20:08 -04:00
Monster Iestyn
cc491d0a1e Sync turnobjs for polyrotate_t thinkers in netgames 2020-06-04 21:31:26 +01:00
Monster Iestyn
d6ef2625f5 sdl/i_main.c: while we're here, split all the logging initialisation code into a separate function, to make main function more clean 2020-06-03 20:47:49 +01:00
Monster Iestyn
8f776b9318 clean up BUGTRAP code in win32/win_main.c to avoid unmatched }
(though that said we don't officially care about the win32 folder files anymore)
2020-06-03 20:47:49 +01:00
Monster Iestyn
1636c90388 V_Init: count to NUMSCREENS, not NUMSCREENS+1 (though I can't help thinking this one might have been deliberate somehow?) 2020-06-03 20:47:49 +01:00
Monster Iestyn
c90b8c583b sdl/i_main.c: fix wrong placement of #endif for LOGMESSAGES code 2020-06-03 20:47:49 +01:00
Monster Iestyn
e2e65d7fae Polyobj_rotate and related: change "origin" to vector2_t since all it needs is x/y and not any of the new stuff for vertex_t 2020-06-03 20:47:49 +01:00
Monster Iestyn
d0d6f76f8e P_XYMovement: initialise slopemom to all zeros 2020-06-03 20:47:49 +01:00
Monster Iestyn
b9d116afb4 dehacked.c: use actual size of descriptions buffers rather than MAXLINELEN, which is way too large 2020-06-03 20:47:49 +01:00
Monster Iestyn
e52e139793 G_ReadMetalTic: Make sure all three values for GZT_XYZ are read in the right order 2020-06-03 20:47:49 +01:00
Monster Iestyn
ef4cb40ed7 G_GhostTicker/G_ReadMetalTic: type should default to MT_NULL, not -1
This way, if for some reason the ghost has no skin, nothing should spawn at all
2020-06-03 20:47:49 +01:00
MascaraSnake
f713487f3c Effect 6 flag allows cutting of cyan pixels on FOF and PolyObject planes (even if they're translucent) 2020-06-03 19:41:47 +02:00
LJ Sonic
24ff9d05e5 Merge branch 'deprecate-fixedrem' into 'next'
Deprecate FixedRem.

See merge request STJr/SRB2!952
2020-06-01 08:30:44 -04:00
MascaraSnake
0d6b0919bb Merge branch 'gravflip-shadows' into 'next'
Move drop shadows to the ceiling for objects in reverse gravity

See merge request STJr/SRB2!973
2020-06-01 07:23:29 -04:00
MascaraSnake
69a7ac6b4e Merge branch 'movement-refactor' into 'next'
Clean up some movement code

See merge request STJr/SRB2!912
2020-06-01 07:21:41 -04:00
LJ Sonic
5da7082418 Merge branch 'traceback' into 'next'
Traceback

See merge request STJr/SRB2!974
2020-06-01 04:17:30 -04:00
LJ Sonic
cccc1be070 Merge branch 'waypoint-bruh' into 'next'
Fix waypoint sequence desyncs

See merge request STJr/SRB2!975
2020-05-31 17:58:38 -04:00
MascaraSnake
636201fa1b Use 0 instead of 0xffff as dummy mobjnum 2020-05-31 22:58:14 +02:00
MascaraSnake
2b92d82b89 Netsync waypoint sequences 2020-05-31 22:44:25 +02:00
Louis-Antoine
25cb181b8e Refactor hook library a little 2020-05-30 20:28:45 +02:00
Louis-Antoine
a71f690241 Show the traceback when a Lua script error happens 2020-05-30 20:24:33 +02:00
lachwright
92cae7aef9 Oops, forgot to #undef 2020-05-31 01:26:23 +08:00
lachwright
3b4df4657a Move drop shadows to the ceiling for objects in reverse gravity 2020-05-31 01:21:26 +08:00
LJ Sonic
4bed63b888 Merge branch 'luacolors-gcc10-fix' into 'next'
Fix the "Custom skincolors" branch not compiling with GCC 10.

See merge request STJr/SRB2!966
2020-05-29 11:23:54 -04:00
sphere
a0a16e2e79 Fix the "Custom skincolors" branch not compiling with GCC 10. 2020-05-28 18:43:04 +02:00
Monster Iestyn
239b758cd1 Merge branch 'master' into next 2020-05-28 16:34:06 +01:00
SteelT
b99dd5ae98 Merge branch 'nowipe-fixes' into 'master'
NOWIPE fixes for colormap and title card wipes

See merge request STJr/SRB2!962
2020-05-28 11:30:01 -04:00
SteelT
1f0feb84b8 Merge branch 'scroller-tweaks' into 'next'
Add back side wall scrollers & allow using offsets for tagged wall scrollers.

See merge request STJr/SRB2!955
2020-05-28 11:29:39 -04:00
LJ Sonic
8c5149f180 Merge branch 'possibly-fix-dedi-crash' into 'next'
Possible fix for dedicated server crashes (aka the msvcrt.dll!_mbscat crash)

See merge request STJr/SRB2!963
2020-05-28 11:29:00 -04:00
SteelT
2739f989dc Merge branch 'fix-input-buffer' into 'next'
Allow input buffer to hold more than 64 tics

See merge request STJr/SRB2!950
2020-05-28 11:27:39 -04:00
SteelT
4b77741f37 Merge branch 'next-lc-uint16' into 'next'
Custom skincolors

See merge request STJr/SRB2!960
2020-05-28 11:23:05 -04:00
Monster Iestyn
9a122fd9c4 Got_AddPlayer: check that I_GetNodeAddress(node) is non-NULL before using strcpy to copy it to the playeraddress array 2020-05-25 21:27:48 +01:00
Monster Iestyn
5c6004f213 Merge branch 'crumblebob-fixes' into 'next'
Fix crumbling floatbob FOFs in MP SS5 rising up into space for no reason

See merge request STJr/SRB2!961
2020-05-25 07:58:21 -04:00
mazmazz
0294f8d26a Fix NOWIPE bugs with colormap fade and title card 2020-05-25 00:20:23 -04:00
mazmazz
505fb1761d Add NOWIPE behavaior for colormap fades 2020-05-25 00:19:41 -04:00
Monster Iestyn
dbe7b57c74 T_BounceCheese: Fix FOF height desync occurring if the FOF fell down too fast (resulting in a bizarre bouncing back up effect in MP SS5 due to P_FloorzAtPos messing up as a result) 2020-05-24 21:15:31 +01:00
SwitchKaze
77a501ecae Fix typo SKINCOLOT 2020-05-24 12:36:20 -05:00
SwitchKaze
58cac1fd73 Make colors UINT16, increase color freeslots to 1024 2020-05-23 19:35:36 -05:00
sphere
8e068e94b0 Rename the rest of the wall scrollers in the ZB config. 2020-05-23 16:41:38 +02:00
MascaraSnake
4fcbb59116 Merge branch 'splitshot-notarget-fix' into 'next'
A_SplitShot no target fix

See merge request STJr/SRB2!956
2020-05-23 07:52:36 -04:00
MascaraSnake
8c38d4e261 Merge branch 'lua-mapthing-len' into 'next'
Lua mapthing len

See merge request STJr/SRB2!957
2020-05-23 07:51:58 -04:00
SwitchKaze
afe56667b8 Update to 2.2.4 2020-05-22 16:47:51 -05:00
Monster Iestyn
11b115083e added the ability to get the # of a mapthing_t in Lua 2020-05-22 18:32:34 +01:00
Monster Iestyn
55dd8739ab A_SplitShot fix: don't even attempt to A_FaceTarget (or anything beyond) if there is no target to face to begin with 2020-05-21 19:42:48 +01:00
Monster Iestyn
b232530695 Merge branch 'sprite-projection-fixes' into 'next'
Sprite projection fixes

See merge request STJr/SRB2!954
2020-05-20 15:33:30 -04:00