Commit graph

10521 commits

Author SHA1 Message Date
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
Louis-Antoine
0540548a98 Update sound and closed captions in connection screen 2020-04-28 00:37:58 +02:00
Louis-Antoine
829bb84b5e Minor adjustements in Snake minigame 2020-04-27 23:15:18 +02:00
Louis-Antoine
1c78e9cdfb Add bonuses and maluses to Snake minigame 2020-04-27 23:10:13 +02:00
Louis-Antoine
3ab29047bd Add pause and retry to Snake minigame 2020-04-27 22:06:32 +02:00
SteelT
e60e115e5c Merge branch 'shaders-optimizations' into 'sal-oglshaderport'
Shader optimizations

See merge request STJr/SRB2!893
2020-04-27 15:19:09 -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
Louis-Antoine
0bdf93e48d Add a background to Snake minigame 2020-04-27 15:31:38 +02:00
MascaraSnake
8e5646d708 Replace P_FindLineFromLineTag with P_FindLineFromTag 2020-04-27 14:34:42 +02:00
MascaraSnake
c2cf8d57d0 Remove P_FindSectorFromLineTag 2020-04-27 14:31:37 +02:00
Louis-Antoine
41253ee689 Call rand() a few times after calling srand() 2020-04-27 14:22:45 +02: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
Louis-Antoine
3c43515cbd Use sprites for snake and apple 2020-04-27 13:01:14 +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
Steel Titanium
3a4a8cd948 Fix window icon being reset when switching renderers on non-Windows platforms 2020-04-26 18:46:43 -04:00
Louis-Antoine
4b94ebd8fd Lower the download progress bar 2020-04-26 21:57:17 +02:00
Louis-Antoine
472be36b87 Prevent edge warping in Snake minigame 2020-04-26 21:17:15 +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
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