Commit graph

9907 commits

Author SHA1 Message Date
MascaraSnake
e967c32a10 Merge branch 'more-thinker-refactor' into 'next'
More thinker refactoring

See merge request STJr/SRB2!900
2020-05-01 05:47:14 -04:00
MascaraSnake
d295996d88 Merge branch 'elevator-cleanup' into 'next'
elevator_t cleanup

See merge request STJr/SRB2!896
2020-05-01 05:46:37 -04:00
MascaraSnake
5cf3fd0074 Merge branch 'next' into elevator-cleanup
# Conflicts:
#	src/p_saveg.c
2020-05-01 11:42:05 +02:00
MascaraSnake
2973b79715 Remove bogus comments from p_saveg.c 2020-05-01 11:25:32 +02:00
LJ Sonic
2c74085826 Merge branch 'join-delay' into 'next'
Add a minimum delay between connections

See merge request STJr/SRB2!889
2020-05-01 03:29:15 -04:00
Monster Iestyn
a96f0a0df3 Merge branch 'strncpy-brullshit' into 'next'
Fix a few strncpy bullshit

See merge request STJr/SRB2!895
2020-04-30 14:53:46 -04:00
Monster Iestyn
405d5e1fc6 Merge branch 'netarchive-cleanup' into 'next'
Netgame $$$.sav code cleanup

See merge request STJr/SRB2!894
2020-04-30 14:53:22 -04:00
Monster Iestyn
edfbd799db Merge branch 'next' into netarchive-cleanup 2020-04-29 15:27:07 +01:00
Monster Iestyn
0ab7d0b4b5 Don't discard const, added missing & 2020-04-29 15:24:28 +01:00
Monster Iestyn
5f3a827609 Whoops the third 2020-04-29 14:45:52 +01:00
Louis-Antoine
4130a30008 Revert "Replace a few instance of strncpy with strlcpy"
This reverts commit b03e0d1289.
2020-04-29 10:55:49 +02:00
LJ Sonic
355912cf35 Merge branch 'fix-intermission-mouse' into 'next'
Fix mouse being grabbed in intermission and cutscenes

See merge request STJr/SRB2!891
2020-04-28 04:25:32 -04:00
MascaraSnake
34c379b479 Merge branch 'raisethinker' into 'next'
Make P_AddRaiseThinker more configurable via function parameters (needed for UDMF)

See merge request STJr/SRB2!899
2020-04-27 15:04:37 -04:00
MascaraSnake
398ee65646 Store "no bosses" setting for lasers in thinker instead of checking sourceline. 2020-04-27 13:09:57 +02:00
MascaraSnake
0dbcd8766b Pass thwomp settings to P_AddThwompThinker 2020-04-27 13:01:31 +02:00
MascaraSnake
40d0fb714d Store tag instead of sourceline in raise thinker 2020-04-27 12:54:08 +02:00
MascaraSnake
0b38dae561 Make P_AddRaiseThinker more configurable via function parameters (needed for UDMF) 2020-04-27 11:19:07 +02:00
Monster Iestyn
bc2f478b43 Merge branch 'planethinker-followup' into 'next'
Clean up the plane thinker cleanup

See merge request STJr/SRB2!897
2020-04-26 13:22:49 -04:00
MascaraSnake
2d860cd362 Make new thinker loading functions set floordata/ceilingdata where necessary 2020-04-26 18:54:03 +02:00
MascaraSnake
ee2ee674d9 Deprecate the camera scanner effect and print a warning when it's used 2020-04-26 18:42:31 +02:00
MascaraSnake
bd40d8df9e Remove obsolete stuff from elevator_t 2020-04-26 18:38:45 +02:00
MascaraSnake
5a3883648d Accidentally changed the wrong SaveElevatorThinker call to SaveCrumbleThinker 2020-04-26 18:31:39 +02:00
MascaraSnake
38a3be00d0 T_StartCrumble refactoring, part 1 2020-04-26 16:51:14 +02:00
MascaraSnake
62ab099b6f Make T_StartCrumble use its own thinker data structure 2020-04-26 11:55:10 +02:00
Louis-Antoine
b03e0d1289 Replace a few instance of strncpy with strlcpy 2020-04-26 00:42:17 +02:00
Louis-Antoine
70d03c9c6f Restore old entry searching functions and add alternate versions for long names 2020-04-26 00:39:52 +02:00
Monster Iestyn
1e1cd04bdf whoops the sequel 2020-04-25 16:53:52 +01:00
Monster Iestyn
b429de12f4 whoops 2020-04-25 16:52:11 +01:00
MascaraSnake
dbebcc8466 Remove a line I overlooked in the thinker cleanup branch 2020-04-25 08:18:48 +02:00
Monster Iestyn
a1a7c3785c Do the same with writing ARCH_FFLOOR values in Lua archiving code (reading was already dealt with years ago) 2020-04-24 22:43:23 +01:00
Monster Iestyn
d06d55e2ae created P_GetFFloorID to get an "ID" of an FOF in its target sector (an opposite to P_GetFFloorByID you could say!), rewrote floor/ceiling rover archiving code to use both P_GetFFloorID and P_GetFFloorByID 2020-04-24 22:29:41 +01:00
Monster Iestyn
cc7185ef30 no diff3 needed for line archiving 2020-04-24 20:58:38 +01:00
Monster Iestyn
c06b4913eb we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway) 2020-04-24 20:57:48 +01:00
Monster Iestyn
ff944f5f94 split sector/lines archiving-related code into their own functions too 2020-04-24 20:40:50 +01:00
Monster Iestyn
d255d29942 remove statsec and statline as they appear to be entirely unused 2020-04-24 20:28:01 +01:00
Monster Iestyn
0916ca3642 Split off FOF archiving-related code into their own functions 2020-04-24 20:26:57 +01:00
Monster Iestyn
f26e8f3df7 Merge branch 'thinker-cleanup' into 'next'
Plane movement thinker cleanup

See merge request STJr/SRB2!880
2020-04-24 14:30:52 -04:00
Monster Iestyn
da9a53daca Merge branch 'crumbling-sink' into 'next'
Sync crumblestate in netgames

See merge request STJr/SRB2!890
2020-04-24 12:53:14 -04:00
Louis-Antoine
71d445a59e Fix mouse being grabbed in intermission and cutscenes 2020-04-24 18:33:35 +02:00
Monster Iestyn
db9c14702d These are flags! Serves me right for just rushing this out 2020-04-24 16:53:54 +01:00
Monster Iestyn
d1e49fa926 Sync crumblestate in netgames 2020-04-24 16:40:09 +01:00
Louis-Antoine
01c9281fc5 Add a menu option for the minimum join delay 2020-04-24 15:38:07 +02:00
Louis-Antoine
ccf4bbe194 Add a minimum delay between connections 2020-04-24 14:05:15 +02:00
Monster Iestyn
8fb68b025f Merge branch 'uh-oh-spriteinfo' into 'next'
Fix minor issue with lua spriteinfo

See merge request STJr/SRB2!872
2020-04-23 16:12:55 -04:00
Monster Iestyn
20ec3f6c89 Merge branch 'emeraldspawnfix' into 'next'
Fix emerald hunt not working properly, part 2

See merge request STJr/SRB2!887
2020-04-23 15:41:27 -04:00
Monster Iestyn
e78a2fa297 Merge branch 'master' into next 2020-04-23 18:49:53 +01:00
LJ Sonic
c7f8791894 Merge branch 'long-names' into 'next'
Enable entry searching functions to retrieve entry names longer than 8 characters

See merge request STJr/SRB2!885
2020-04-23 04:40:33 -04:00
sphere
7955c96fa1 Restore carelessly removed const keywords. 2020-04-22 23:38:10 +02:00
sphere
d5863b912f Move variable declarations outside of for loops. 2020-04-22 23:17:18 +02:00
sphere
13c47b9e6f Fix variable-length array definition, just in case. 2020-04-22 23:10:43 +02:00