Commit graph

9582 commits

Author SHA1 Message Date
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
MascaraSnake
d2e21afaf1 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
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
Louis-Antoine
151fe6be07 Improve controls handling in connection screen minigame 2020-04-24 19:27:42 +02:00
Louis-Antoine
0928375bc4 Add a Snake minigame to the downloading screen 2020-04-24 19:27:29 +02: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
Zachary McAlpin
d0fdb0b588 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-04-23 18:39:31 -05:00
Zachary McAlpin
0de0ecb895 Execute LUAh_GameQuit earlier in M_QuitResponse
It just feels a bit funny to execute LUAh_GameQuit if you are playing a session after the quit screen appears instead of before.
2020-04-23 17:38:08 -05: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
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
sphere
b3b7ffb889 Make P_SpawnEmeraldHunt even more concise, using Fisher-Yates shuffle. 2020-04-22 22:46:12 +02:00
sphere
d7185516f5 Fix a mistake with P_SpawnEmeraldHunt and make it more concise. 2020-04-22 20:38:58 +02:00
sphere
0868930d3b Make emerald hunt shards spawn at correct heights, and add Float option. 2020-04-22 18:58:40 +02:00
Zipper
e794810d47 Update p_user.c 2020-04-22 07:59:08 -04:00
Nev3r
3d6d767bce Initialize pitch and roll on textmap mapthings too. 2020-04-22 09:00:29 +02:00
Nev3r
fbb2450133 Merge branch 'udmf-next' into udmf-thingargs
# Conflicts:
#	src/p_setup.c
2020-04-22 08:58:40 +02:00
ZipperQR
d62d43a76b Dust devil support 2020-04-22 00:59:12 +03:00
Nev3r
3358413479 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
0368c7b4bd 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
74fd37fa38 Let W_CheckNumForName(Pwad) find entries with long names 2020-04-21 11:08:18 +02:00
Louis-Antoine
90ebe18c5a Add a longname field to lumpinfo_t 2020-04-21 10:21:41 +02:00
Louis-Antoine
74e8d7f733 Rename lumpinfo_t.name2 to lumpinfo_t.fullname 2020-04-20 23:40:41 +02:00
Nev3r
2d15e953eb Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-04-20 09:05:21 +02:00
James R
1d2d5266ab Merge branch 'flipfuncpointers-master' into 'master'
Flipfuncpointers (take two)

See merge request STJr/SRB2!864
2020-04-19 18:23:56 -04:00
Nev3r
ccb8e7a7c6 Use fixed_t on the mapthing scale for the sake of coherence. 2020-04-19 18:34:00 +02:00
Nev3r
1ebfeb3be6 Add mapthing pitch/roll Lua access as well. 2020-04-19 17:19:04 +02:00
Nev3r
9eb5fe954d Add missed pitch and roll to precipmobj_t 2020-04-19 16:05:08 +02:00
Nev3r
c00f995b7f Move the scale setting code behind the MapthingSpawn hook. 2020-04-19 16:00:57 +02:00
Nev3r
f55f425d1a Add Lua support. 2020-04-19 15:56:06 +02:00
Nev3r
5632120a74 Add mapthing scale support; fields scale, scalex and scaley set the only mapthing scale field alike. 2020-04-19 15:18:36 +02:00
Nev3r
da165d2d22 Add textmap pitch and roll parsing, and mobj pitch and roll variables. 2020-04-19 14:51:55 +02:00
Nev3r
268a66a55a Fix an outrageous typo which didn't get pushed for some reason. 2020-04-19 12:23:51 +02:00
James R
28b1e8de1c Merge remote-tracking branch 'origin/master' into next 2020-04-18 17:20:33 -07:00
James R
01da59fe02 Merge branch 'angle-for-spawn-object' into 'next'
Make the Spawn Object linedef executor able to set the object's angle.

See merge request STJr/SRB2!877
2020-04-18 20:16:07 -04:00
James R
a7291a2ad4 Merge branch 'packetversion-revision' into 'master'
The rule for PACKETVERSION is too confusing, it's also too hard to unify formats

See merge request STJr/SRB2!875
2020-04-18 20:15:23 -04:00
James R
7e981edfcc Merge branch 'continue_tweaks' into 'next'
A tangible mechanism to disable Continues

See merge request STJr/SRB2!865
2020-04-18 20:15:04 -04:00
MascaraSnake
c1dff185bf Add enums to encapsulate the textmap colormap settings 2020-04-18 17:15:25 +02:00
MascaraSnake
7978920b53 Merge branch 'udmf-next' into udmf-argenums 2020-04-18 16:56:21 +02:00