Commit graph

10048 commits

Author SHA1 Message Date
MascaraSnake
82bf72f5e1 Remove obsolete stuff from elevator_t 2020-04-26 18:38:45 +02:00
MascaraSnake
f4282718dc Accidentally changed the wrong SaveElevatorThinker call to SaveCrumbleThinker 2020-04-26 18:31:39 +02:00
MascaraSnake
554de0e0f5 T_StartCrumble refactoring, part 1 2020-04-26 16:51:14 +02:00
MascaraSnake
295ed303af Make T_StartCrumble use its own thinker data structure 2020-04-26 11:55:10 +02:00
MascaraSnake
e00531ed9c Merge branch 'udmf-next' into udmf-fofs-mkii
# Conflicts:
#	src/p_floor.c
#	src/p_spec.c
#	src/p_spec.h
2020-04-26 11:13:09 +02:00
MascaraSnake
b439fa2b99 Uh-oh! Forgot to stash a file 2020-04-26 10:37:31 +02:00
MascaraSnake
abcc47ac61 Bring signature of P_AddAirbob in line with next 2020-04-26 10:35:08 +02:00
MascaraSnake
1aa90754db Port over raise thinker changes from next (preparation for merge) 2020-04-26 10:33:13 +02:00
Louis-Antoine
2e27f32d3e Replace a few instance of strncpy with strlcpy 2020-04-26 00:42:17 +02:00
Louis-Antoine
212358dbba Restore old entry searching functions and add alternate versions for long names 2020-04-26 00:39:52 +02:00
Monster Iestyn
7034e2537a whoops the sequel 2020-04-25 16:53:52 +01:00
Monster Iestyn
049a7db877 whoops 2020-04-25 16:52:11 +01:00
MascaraSnake
0ab01cd4b2 Port over thwomp thinker changes manually, to avoid merge conflicts 2020-04-25 09:20:53 +02:00
MascaraSnake
04c10ed41b Merge branch 'next' into udmf-next 2020-04-25 08:19:26 +02:00
MascaraSnake
3cd8f62ae9 Remove a line I overlooked in the thinker cleanup branch 2020-04-25 08:18:48 +02:00
Monster Iestyn
49cceda15b 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
7dda5f6b94 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
e406a7bef5 no diff3 needed for line archiving 2020-04-24 20:58:38 +01:00
Monster Iestyn
1e61229cb7 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
c1d2b8301b split sector/lines archiving-related code into their own functions too 2020-04-24 20:40:50 +01:00
Monster Iestyn
2d45decbb0 remove statsec and statline as they appear to be entirely unused 2020-04-24 20:28:01 +01:00
Monster Iestyn
08a7fcbe8d Split off FOF archiving-related code into their own functions 2020-04-24 20:26:57 +01:00
MascaraSnake
3170f2b8c3 Merge branch 'next' into udmf-next
# Conflicts:
#	src/p_mobj.c
#	src/r_segs.c
2020-04-24 21:15:53 +02:00
Monster Iestyn
d1d006a1a7 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
eaeb9358a3 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
e4f2c1dc70 Fix mouse being grabbed in intermission and cutscenes 2020-04-24 18:33:35 +02:00
Monster Iestyn
9df5d6e1e0 These are flags! Serves me right for just rushing this out 2020-04-24 16:53:54 +01:00
Monster Iestyn
2419b65f79 Sync crumblestate in netgames 2020-04-24 16:40:09 +01:00
Louis-Antoine
c90cc3b58f Add a menu option for the minimum join delay 2020-04-24 15:38:07 +02:00
Louis-Antoine
9ec4ba3824 Add a minimum delay between connections 2020-04-24 14:05:15 +02:00
Monster Iestyn
bfb2467796 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
4ef8093e92 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
a71fe6445a Merge branch 'master' into next 2020-04-23 18:49:53 +01:00
LJ Sonic
5e440e79cc 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
67f511a55e Restore carelessly removed const keywords. 2020-04-22 23:38:10 +02:00
sphere
f85bfc87f5 Move variable declarations outside of for loops. 2020-04-22 23:17:18 +02:00
sphere
e26788d014 Fix variable-length array definition, just in case. 2020-04-22 23:10:43 +02:00
sphere
01a1297631 Make P_SpawnEmeraldHunt even more concise, using Fisher-Yates shuffle. 2020-04-22 22:46:12 +02:00
sphere
b254cb186b Fix a mistake with P_SpawnEmeraldHunt and make it more concise. 2020-04-22 20:38:58 +02:00
sphere
25affe6948 Make emerald hunt shards spawn at correct heights, and add Float option. 2020-04-22 18:58:40 +02:00
Nev3r
a3c9009389 Merge branch 'udmf-thingargs' into 'udmf-next'
Add mapthing arg support.

See merge request STJr/SRB2!874
2020-04-22 03:07:34 -04:00
Nev3r
1afb0eb79f Initialize pitch and roll on textmap mapthings too. 2020-04-22 09:00:29 +02:00
Nev3r
188ad67c58 Merge branch 'udmf-next' into udmf-thingargs
# Conflicts:
#	src/p_setup.c
2020-04-22 08:58:40 +02:00
Nev3r
3d9d9d74f6 Merge branch 'udmf-pitch-and-roll' into 'udmf-next'
Add textmap pitch and roll parsing, and mobj pitch and roll variables.

See merge request STJr/SRB2!882
2020-04-21 12:27:26 -04:00
Nev3r
f4c2d70c7e Merge branch 'udmf-mthingscale' into 'udmf-next'
Add mapthing scale support

See merge request STJr/SRB2!883
2020-04-21 12:26:46 -04:00
Louis-Antoine
0ddd2fea21 Let W_CheckNumForName(Pwad) find entries with long names 2020-04-21 11:08:18 +02:00
Louis-Antoine
29a94ee26a Add a longname field to lumpinfo_t 2020-04-21 10:21:41 +02:00
Louis-Antoine
f6e2c7063f Rename lumpinfo_t.name2 to lumpinfo_t.fullname 2020-04-20 23:40:41 +02:00
Nev3r
efb81fc526 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-04-20 09:05:21 +02:00
James R
e79d8c7896 Merge branch 'flipfuncpointers-master' into 'master'
Flipfuncpointers (take two)

See merge request STJr/SRB2!864
2020-04-19 18:23:56 -04:00