Commit graph

10497 commits

Author SHA1 Message Date
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
Hannu Hanhi
9daa78554d Optimization: also don't reset shader on models 2020-04-25 16:32:44 +03:00
Hannu Hanhi
cb62882e5a Optimization: only call pglUseProgram if shader actually needs changing 2020-04-25 16:32:32 +03:00
Hannu Hanhi
44c420a671 Optimization: Don't reset shader program at end of DrawPolygon, instead reset it in UnSetShader 2020-04-25 16:32:21 +03:00
Nev3r
a354db9cde Merge branch 'shaders-merge-again' into 'sal-oglshaderport'
Funny shaders master merge

See merge request STJr/SRB2!892
2020-04-25 07:41:59 -04:00
MascaraSnake
dbebcc8466 Remove a line I overlooked in the thinker cleanup branch 2020-04-25 08:18:48 +02:00
James R
eb0ba37dce Merge remote-tracking branch 'origin/master' into HEAD 2020-04-24 22:10:59 -07:00
James R
1779d1b86c Merge branch 'shaders-222' into 'sal-oglshaderport'
shaders master merge and mipmap fix

See merge request STJr/SRB2!848
2020-04-25 00:06:06 -04: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
Louis-Antoine
90ef711412 Fix compiler warnings 2020-04-24 22:19:05 +02: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
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
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
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
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
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
ZipperQR
d62d43a76b Dust devil support 2020-04-22 00:59:12 +03: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
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
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