Commit Graph

10497 Commits

Author SHA1 Message Date
Monster Iestyn b11d58aef5 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 5349a0bf62 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 bb1a2dbba7 sdl/i_main.c: fix wrong placement of #endif for LOGMESSAGES code 2020-06-03 20:47:49 +01:00
Monster Iestyn 8092d30376 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 7340442839 P_XYMovement: initialise slopemom to all zeros 2020-06-03 20:47:49 +01:00
Monster Iestyn adb11eec1b 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 d11ba67288 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 879a2bd20a 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 33ed36cf4b 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
Louis-Antoine 9be188ff02 Minor edit 2020-06-02 10:31:56 +02:00
Louis-Antoine 286b316cf9 Fix dofile() return incorrect values 2020-06-01 15:43:14 +02:00
LJ Sonic 6895d7df92 Merge branch 'next' into 'dofile'
# Conflicts:
#   src/lua_script.c
#   src/lua_script.h
2020-06-01 09:28:56 -04:00
Louis-Antoine e6ffedbce8 Fix food occasionally spawning inside the snake 2020-06-01 15:21:16 +02:00
LJ Sonic 04c7eeb6ae Merge branch 'deprecate-fixedrem' into 'next'
Deprecate FixedRem.

See merge request STJr/SRB2!952
2020-06-01 08:30:44 -04:00
LJ Sonic 715cb857f5 Merge branch 'next' into 'better-download'
# Conflicts:
#   src/sdl/i_system.c
#   src/win32/win_sys.c
2020-06-01 08:16:53 -04:00
LJ Sonic e2b860dc28 Merge branch 'next' into 'fix-spawn-desynch'
# Conflicts:
#   src/p_map.c
2020-06-01 08:15:02 -04:00
MascaraSnake b13f29852f 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 8d7f4e3265 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
Louis-Antoine 3c3a60d189 Fix "downloads" command reporting incorrect progress 2020-06-01 10:37:05 +02:00
LJ Sonic dd18915570 Merge branch 'traceback' into 'next'
Traceback

See merge request STJr/SRB2!974
2020-06-01 04:17:30 -04:00
LJ Sonic 82af11d0df 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 508160ed42 Use 0 instead of 0xffff as dummy mobjnum 2020-05-31 22:58:14 +02:00
MascaraSnake 3a4502fa87 Netsync waypoint sequences 2020-05-31 22:44:25 +02:00
SwitchKaze 5a18bdf20b Fix SOC color name reading 2020-05-30 16:52:44 -05:00
Louis-Antoine d31346822d Refactor hook library a little 2020-05-30 20:28:45 +02:00
Louis-Antoine 1bacaedde2 Show the traceback when a Lua script error happens 2020-05-30 20:24:33 +02:00
lachwright f32d29f700 Oops, forgot to #undef 2020-05-31 01:26:23 +08:00
lachwright a7f73bfa85 Move drop shadows to the ceiling for objects in reverse gravity 2020-05-31 01:21:26 +08:00
lachwright 5136a4d41d Don't cut momentum if landing in a roll 2020-05-30 19:07:16 +08:00
lachwright b874da5229 Ensure followmobj ghost exists before applying fuse 2020-05-30 18:26:11 +08:00
lachwright 51b640ad5a Feedback so far indicates the old booster effect is preferred 2020-05-30 18:21:39 +08:00
lachwright ae5d5b9546 Merge branch 'next' into dashmode-fixes 2020-05-30 18:13:21 +08:00
SwitchKaze d589e6bc95 Fix signpost shade. 2020-05-29 21:41:20 -05:00
Zachary McAlpin 7bdea21435 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-05-29 15:32:59 -05:00
Louis-Antoine 1dbb755743 Add dofile() to Lua 2020-05-29 17:35:07 +02:00
LJ Sonic b7c5163419 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 71cf31fcaf Fix the "Custom skincolors" branch not compiling with GCC 10. 2020-05-28 18:43:04 +02:00
Louis-Antoine c6e13d0e30 Fix crash when setting a mobj's angle from a Lua script 2020-05-28 18:34:56 +02:00
Monster Iestyn 755e9d659d Merge branch 'master' into next 2020-05-28 16:34:06 +01:00
SteelT 5542893548 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 07da7f7d29 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 aab6339e66 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 1c42102ddb 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 f0b64971a0 Merge branch 'next-lc-uint16' into 'next'
Custom skincolors

See merge request STJr/SRB2!960
2020-05-28 11:23:05 -04:00
Louis-Antoine 67eef5a37f Fix potential desynch when a player spawns 2020-05-28 11:03:35 +02:00
Louis-Antoine bb1e3fdf13 Add a few missing calls to GameQuit hook 2020-05-27 14:58:10 +02:00
Monster Iestyn 40566e6926 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 97cf90b9af 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 272362a86f Fix NOWIPE bugs with colormap fade and title card 2020-05-25 00:20:23 -04:00
mazmazz 8fee9a51ce Add NOWIPE behavaior for colormap fades 2020-05-25 00:19:41 -04:00