The usual SRB2 merge, but for GCC 9 errors too

Since you are merging changes from SRB2 2.1.23 to 2.1.24, you are merging changes that will break netplay, so, you should point to the next branch

changed target branch from master to next

But REALLY, you can revert d4dac527, merge to master, then when you merge to next, revert that revert

Is a revert necessary when the target branch has changed?

Well, now, then all new pushs that do not include this changeset, I will get them merged with next just so I can avoid the silly build failure emails. Will that be fine?

added 51 commits

• d542c244 - musicplus-feature-endoflevel 2.2 -> 2.1 backport
• 1dd47e85 - EndOfLevel: Check player->exiting > 0 && <= TICRATE, fixes start-of-level fading in 2.1
• b057b293 - EndOfLevel: 2.1 dehacked setup fix
• 481c0d76 - EndOfLevel: 2.1 _clear -> lclear music in y_inter
• 75558c40 - Merge branch 'public-musicplus-core' into public-musicplus-feature-endoflevel
• be5555d3 - Merge branch 'public-musicplus-core' into public-musicplus-feature-endoflevel
• 0bc6b2e4 - Merge branch 'public-musicplus-core' into public-musicplus-feature-endoflevel
• 0186f678 - a
• 773f9dc2 - Merge remote-tracking branch 'public-gl/next' into public-musicplus-feature-endoflevel
• b5fc27c5 - Implement MUSICINTERFADEOUT level header
• ba77dfd5 - Merge branch 'public-musicplus-feature-interfadeout' into public-musicplus-feature-endoflevel
• e098d6a8 - Merge branch 'public-musicplus-feature-interfadeout' into public-musicplus-feature-endoflevel
• a1ccb851 - Merge branch 'public-gl-next' into public-musicplus-feature-endoflevel
• 587a51a9 - Fix end-of-level fading for cv_playersforexit
• f18103a4 - Declare exitfadestarted properly
• d00cc7cd - Prevent just anyone from skipping credits but allow admins
• 34ce3688 - Merge branch 'next' into jimita-unfuck-awayview
• 50e8f13c - Fix FOF slopes briefly glitching on level load in software mode, by ensuring the…
• 1638fad7 - Part 2 of fix, make sure copied slopes also pass on hasslope status to attached…
• 62ed90b2 - fix type mismatch by typecasting
• 04215b73 - Merge branch 'fof-slopes-level-load-fix' into 'next'
• f84c8980 - Merge branch 'master' into next
• 755e4a8b - Merge branch 'make-credits-great-again' into 'next'
• c9456e14 - Merge branch 'master' into next
• d9ca8b45 - Saving work so far, UNTESTED
• 826e8e1a - Fixed goofups I missed back 3 months ago
• f7357a02 - Merge branch 'pk3-folders-are-not-textures-backport' into 'next'
• 47eb7110 - Merge branch 'public-musicplus-feature-endoflevel' into 'next'
• 2c906e9c - Merge branch 'jimita-unfuck-awayview' into 'next'
• 3a9ce483 - Merge branch 'master' into next
• 91502f14 - Don't send login final hashes to everyone
• 6eaf7625 - Merge branch 'master' into next
• 963d2f5d - Merge branch 'master' into next
• 81b294ee - Merge branch 'master' into next
• 8fa54c1a - Modify P_CheckSector with a modified version of Sal's attempted proper fix for…
• 27dd99ae - Remove commented out P_CheckSector calls and add extra comments explaining the situation
• c8d1dd3b - P_LineOpening: set int32 max/min as defaults for opentop, openbottom etc if a…
• cda81cc1 - Edit a lot of the rest of the polyobject-related code in P_LineOpening to make…
• bbefc3b7 - After looking at the FOF part of P_LineOpening for a while I now realise many of…
• 392cb89f - Merge branch 'polyobj-fixes-backport' into 'next'
• ae9ecef5 - Use P_MobjInsidePolyobj instead of P_MobjTouchingPolyobj, so that you can be…
• 99f04f1d - Merge branch 'polyobj-crush-fix-mi' into 'next'
• e52a314d - Update version to 2.1.25
• 450ea0cc - Disable the level end music fade code for now, because we discovered it causes freezes sometimes.
• 0949406b - Update MD5 for patch.dta
• 19dd9a3c - Kart discrepancies
• c1ba72ea - Remove a printf
• 9c1fa867 - Include md5.h
• 9a4a90c9 - Merge branch 'netcode-exploits' into 'next'
• c50831f8 - Merge branch '2.1.25-prep' into 'next'
• ed6dcf0b - Merge remote-tracking branch 'srb2-pub/master' into srb2-merge

Compare with previous version

added 1 commit

• 4c5ad4bb - I alway manage to fuck up a merge. Yes, it's true!

Compare with previous version

added 9 commits

• 6ef9ee54 - true not TRUE
• e5071bb6 - Compare the file name only for real
• 7a199748 - Merge branch 'based-files' into 'master'
• dadec119 - Warn on implicit fallthrough
• 78075ecd - Fix FALLTHRU for Win32 console interface code
• fc2f130a - Merge remote-tracking branch 'srb2-pub/master' into srb2-merge
• 03a590ad - fallthru is not FALLTHRU
• 5ef48c18 - Fallthroughs
• 4eae79bd - Fix NOHW compiling

Compare with previous version

added 23 commits

• 34645238 - Fix MF_NOCLIPTHING
• e9771cd7 - Make FixedRem less laggy by just using the modulo operator.
• cfc9e23c - Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into fix-fixedrem
• aa165f4f - Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into fix-fixedrem
• ac7db851 - Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into fix-fixedrem
• 2dd5f1ab - Fixes for lib_cvRegisterVar (the Lua version of CV_RegisterVar):
• 7731bf6b - Use correct integer format
• 74de8048 - Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into fix-fixedrem
• 70904134 - Merge branch 'calling-all-lua-consvars' into 'next'
• 9f7613ef - Typecast p to INT16
• 08808e22 - I don't even know how this happened
• 964693d5 - Merge branch 'master' into next
• 13d627ee - Remove extra whitespace
• 02899691 - Merge branch 'master' into next
• 14cd7a5a - Merge branch 'master' into fix-fixedrem
• 062f0278 - Merge branch 'master' into next
• 92779487 - avoid the source code from getting the wrong EOL
• bf28a7f5 - Merge branch 'master' into next
• 88615f58 - Merge branch 'lua-error-print-fix' into 'master'
• b32a0315 - Merge branch 'fix-MF_NOCLIPTHING' into 'next'
• 91d3f7e2 - Merge branch 'fix-fixedrem' into 'next'
• 34bddc1c - Merge remote-tracking branch 'origin/master' into next
• de37af7d - Merge remote-tracking branch 'srb2-pub/next' into srb2-merge

Compare with previous version

closed