Fix the Master Server so it works

changed the description

added 84 commits

5cad35f2...e79d8c78 - 82 commits from branch STJr:master
79d61db1 - Merge branch 'master' into masterserver
3ff17593 - Allow multiple ports to host under one IP address.

Compare with previous version

added 1 commit

07a79105 - Fix small inconsistency

Compare with previous version

added 309 commits

07a79105...feced5ec - 306 commits from branch STJr:master
9c44ab89 - Fix the Master Server so it works
8f767d44 - Allow multiple ports to host under one IP address.
beafdd41 - Fix small inconsistency

Compare with previous version

Thanks for this, I've been struggling for way too long to get that project working. It's good that other people can host this for during the time when the MS is down.

I haven't figured out how to setup compiling the master server using MinGW due to my lack of advanced knowledge on how setting up compiling works, but I have good faith in this merge request from the results I've seen.

added 422 commits

beafdd41...70eb5ba6 - 28 commits from branch STJr:master
7851bef9 - Port of Jimita's shader stuff + my lighting shader
da3d5a01 - Merge next
43947488 - Update blend textures to smooth out colors that have duplicate indices
3eb65701 - Fake contrast
4c666429 - Increase precision of smooth contrast
a66fb15f - Merge branch 'next' into oglshaderport
dcc7426d - Merge branch 'next' into oglshaderport
74d7f256 - More blend image updates
ca5b5618 - Merge next
a35a2c81 - Fix errors
7d8ff430 - Basic fog shader
465b3b15 - Water surface shader
fe809b27 - Fullbright transparent planes
d865b72b - Splits part of PTR_SlideTraverse into a lua-exposed function, exposes P_RailThinker
943ede73 - Merge remote-tracking branch 'upstream/next' into lua-railstuff
23bd91fc - Merge remote-tracking branch 'nami/next' into namirays
5fac6f54 - Merge branch 'namirays' into oglshaderport
d87f2565 - How'd this happen...?
c98497e6 - More breakage
7d5a8ac1 - Allow G_BuildMapName outside of levels
50b18acd - Expose G_BuildMapTitle to Lua
e5215e92 - Merge branch 'gl-dropshadows' into oglshaderport
ef81bf81 - ??
56f96674 - Slope contrast
a12d6885 - Merge branch 'gl-dropshadows' into oglshaderport
7e333c63 - input is reserved apparently
b7b24eb5 - Buold.
7266e087 - towards
014638ea - Fix view aiming / shearing
1601f0c6 - Update copyright text
544d6acc - Delete USE_PALETTED_TEXTURE again
1755c240 - Fix the gl_leveltime problem, I guess.
77013545 - Restore some model lighting code that went gone in the shaders code
968fea03 - Fix implicit operand because GLSL is a goof or such
d24060bb - Wait.
11c3721d - Fix warnings around load_shaders
d0190803 - I LOVE MENU CODE!
a521e40c - bye
922ac735 - Menu organisation
afa9b58c - fix corona compiling lol
686d8e41 - st_translucency went missing in here for... reasons...
0246026a - I don't know why this happened
b18c0cfc - Un-HWRENDER shader lump names
7c4c04ca - Fix custom shader loading
1c7b584d - I_Error is too extreme I think, just CONS_Alert instead
075ae996 - GL_DBG_Printf instead of CONS_Alert
bdc1594b - Redundant define?
2731c9e9 - Add newlines to GL debug print.
8401e097 - remove includes
b9b19588 - make NOTEXTURE_NUM 1
c219a170 - Stop using NextTexAvail you dunce
647107a2 - Same deal for screen textures
8bcdd105 - I'll put this back in here, I guess.
e576c1ad - make up for the lack of ogllog.txt
9e79b337 - Fix NOTEXTURE_NUM
aea720ef - Merge branch 'sal-oglshaderport' of https://git.magicalgirl.moe/STJr/SRB2 into sal-oglshaderport
bdd43efb - Fix -OGLlib
c87119f1 - Fix shader reading yet again
af7b4795 - port pfnUpdateTexture
82492f35 - DoScreenWipe is void
35983c7a - load_shaders -> Shader_Load + Shader_SetUniforms
93fe6a50 - glFog is unused
b6b875f9 - so is the accumulation buffer (deprecated)
b0ba9d22 - i want to die
a321ec91 - no more 3dfx
d2bfc673 - Distance orbital camera appropriately when gr_shearing is enabled
65da251a - Fix ACZ fence texture
59cc097d - Merge branch 'sal-oglshaderport' of https://git.magicalgirl.moe/STJr/SRB2 into sal-oglshaderport
82896126 - Update w_wad.c
68f4d415 - Merge remote-tracking branch 'origin/next' into sal-oglshaderport
07b2a5ac - FIX COLOR BUG
8305d657 - Drop shadows closer to software
33a75fcd - Remove blend to black
90eb6a60 - Merge remote-tracking branch 'tehrealsalt/oglshaderport' into sal-oglshaderport
11e6cf0a - add "third person only" option to gr_shearing.
e1573913 - split r_isviewpointfirstperson
d633435c - i'm not paying too much attention, am i.
b38f336d - why does this still exist?
9bc0592e - don't free pu_cache.
384f5af1 - move hw texture used to be always below.
7cfc8d02 - allow models for skin/sprites with same name
81a2a9e9 - fix crash
00bdb416 - Merge remote-tracking branch 'origin/master' into sal-oglshaderport
d0ee4ad4 - Change the default setting of cv_grshearing to Off
8bd5193e - Merge remote-tracking branch 'origin/master' into sal-oglshaderport
adee6c39 - I forgot to save :]
56b67a3b - Custom skincolors
6415e102 - Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors
58d43548 - Fix userdataType typo
572bffcd - Award pink shields in friendly gametypes
f313a038 - Don't reset player between maps in campaign gametypes
b622f539 - Always allow skin switching in friendly gametypes
a334542f - Scan for emeralds in gametypes with Emerald Hunt
1b8e172a - Consider Co-Op here as any campaign gametype
290cd9d0 - Same here
7439ab52 - Allow countdown time-up in any campaign gametype
678935f2 - Turn players IT if they join the game after the hide time in tag gametypes
b103a792 - Let spectators decide where they spawn
952bce36 - Remove unused SOC menu types
51c593e6 - Fix homing ring using the wrong team gametype rule
3ce4ddf8 - Fix incorrect team gametype rule being used in A_OldRingExplode
fd062308 - Score adding and stealing should check the gametype's rules.
d3ed5ad4 - Race is Competition without the lives
6fb5a6ef - Consider hide-and-seek as GTR_HIDEFROZEN
4e7b4744 - G_CoopGametype, for all the GT_COOP cases
7d77600e - Make exitmove friendly, don't start empty intermission screens
3106a92e - Prohibit modification of built-in colors
21b28b62 - Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors
fd4666b4 - Bruh.
bb08b55b - Created GameQuit hook, but I need to decide where to execute it
4d7f64a5 - Let's call LUAh_GameQuit in D_QuitNetGame since that function is still called outside of netgames
4d144f2e - No longer call LUAh_GameQuit in D_QuitNetGame
2b169711 - Call LUAh_GameQuit in Command_ExitGame_f
bef49f56 - Don't execute LUAh_GameQuit in Command_ExitGame_f if you are in a multiplayer game
7ec241c5 - Revert "Don't execute LUAh_GameQuit in Command_ExitGame_f if you are in a multiplayer game"
f97187f5 - Revert "Call LUAh_GameQuit in Command_ExitGame_f"
b9d7b3e5 - Merge remote-tracking branch 'upstream/master' into shaders-222
e3b17cd8 - Use po2 patches to fix mipmaps
de9dc43b - Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
a329ca43 - Call ``LUAh_GameQuit`` in 2 places.
b067d1e1 - Revert "Call ``LUAh_GameQuit`` in 2 places."
0e56202d - Let's just call LUAh_GameQuit in Command_ExitGame_f during its execution if you…
7c655773 - Let's just call LUAh_GameQuit in I_Quit anyways
766ca2f5 - Since exitgame shuts down the server if you are running a dedicated server I may…
8b7f93d5 - Revert "Let's just call LUAh_GameQuit in I_Quit anyways"
2052ee11 - Check if you are playing a game then execute ``LUAh_GameQuit`` if you are in…
569034d3 - Call LUAh_GameQuit in I_GetEvent in if the event is SDL_Quit and if you are in a playing session
077543f2 - Fix typo in camera handling code
6f9422d3 - Encapsulate plane height checks
ea631715 - Remove unused define
478f0f20 - Cleanup P_IsClimbingValid
6ffbc89f - Remove redundant conditional in P_IsClimbingValid
60f7e353 - Character select in Nights mode.
21353f12 - Screw merge conflicts
decce790 - Moved LUAh_GameQuit(void) function to the end of the lua_hooklib.c
c629883a - Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
28de6b1f - Execute LUAh_GameQuit in 2 additional places in m_menu.c
31b19f69 - Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
64edd91d - Dust devil support
657ee828 - Update p_user.c
f6120410 - Execute LUAh_GameQuit earlier in M_QuitResponse
187efb4d - Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
9ac3fd20 - Add a Snake minigame to the downloading screen
d235d401 - Improve controls handling in connection screen minigame
10fbaaf7 - Fix compiler warnings
9f7a0a11 - Merge branch 'shaders-222' into 'sal-oglshaderport'
fe9b933b - Merge remote-tracking branch 'origin/master' into HEAD
200fbc04 - Merge branch 'shaders-merge-again' into 'sal-oglshaderport'
0758a8ca - Optimization: Don't reset shader program at end of DrawPolygon, instead reset it in UnSetShader
c0c095e1 - Optimization: only call pglUseProgram if shader actually needs changing
78c2928b - Optimization: also don't reset shader on models
7c9ce1fa - Prevent edge warping in Snake minigame
380e246b - Lower the download progress bar
58c0383e - Use sprites for snake and apple
c7cd53d5 - Call rand() a few times after calling srand()
647d74ba - Add a background to Snake minigame
7c583b4c - Merge branch 'shaders-optimizations' into 'sal-oglshaderport'
a3dcc100 - Add pause and retry to Snake minigame
dfdace22 - Add bonuses and maluses to Snake minigame
231a835b - Minor adjustements in Snake minigame
752b48de - Update sound and closed captions in connection screen
196c1254 - Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
ff8f4864 - HWR_ProcessSeg skywall processing from master
be99670a - More HWR_ProcessSeg sky code from master
165b6c24 - Dashmode fixes:
dd645d88 - Update p_user.c
c1304e01 - Clean up Thwomp spawning code
2a392651 - Make the laser thinker find the FOF itself instead of storing it in the thinker struct
19d77bfc - P_PlayerMobjThinker: Move crumbling platforms check into its own function
2605f29b - P_PlayerMobjThinker: Move check for floatbob platforms into its own function
afc63788 - P_PlayerZMovement: Move checks for Mario blocks into their own function
29192eff - Merge branch 'remove-polyobjects' into movement-refactor
a67c8786 - P_PlayerZMovement: Move PolyObject handling code into its own function
929064b9 - Refactor PTR_SlideTraverse
bc2d0dce - Some minor PTR_GlideClimbTraverse cleanup
ddb4c2c9 - Refactor P_PushableCheckBustables
12210481 - Revert some very incorrect refactoring
452fd100 - Refactor P_CheckBustableBlocks
64a153fd - Render stats
8dcc2fe2 - Move some render stats variables to better locations, add I_FinishUpdate timing
7e8543a4 - More render stats for software mode, renamed and relocated some render stats variables
724e093c - Render stats cleanup
1b6e65b9 - Implement I_GetTimeMicros without affecting I_GetTime behaviour details
c9114867 - Dummy I_GetTimeMicros
d0d25025 - Refactor P_CheckBouncySectors
0d7c49e7 - no message
d0376e28 - S_StopSoundByID Lua support
87f7100d - Update p_user.c
61562683 - Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
39c5ab4e - Merge remote-tracking branch 'origin/next' into gtr-fixes
38c74cec - Avoid a crash
614f45b3 - Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into snake
dc55ab9a - Use W_CachePatchLongName in Snake minigame
435e6c98 - Rename variables for Fang waypoints, in preparation for new global waypoint data structure
69c11a82 - Support act numbers up to 99 and draw both digits individually.
0287c695 - Fix some errors and add some comments. Also, actnum is not an INT32.
4eb5f09c - Restore SHORT().
061fd476 - Rename some file transfer functions
bf660dd3 - Rename local variables
d708789c - Store waypoints (for zoom tubes, rope hangs, polyobjects) explicitly
36843cbf - Merge branch 'next' into waypoints
aa16bd22 - Fix accidental swap of first and last waypoint
acdb4b42 - Merge branch 'actnum-tweaks' into 'next'
b561ee79 - Remove diffx/y/z from polywaypoint_t, since they're always 0 anyway
7413da91 - Store PolyObject waypoint return behavior in an enum
6a9543b1 - no message
ee520b4a - split significant chunks of G_CheckDemoStatus into their own smaller functions,…
d593e2e1 - Introducing Marathon Run. (I was going to call it Marathon Mode, but NiGHTS Mode…
9cd9d2e0 - Merge branch 'carry-dust-devil' into 'next'
e99d38ff - Make a falsy useBlackRoc prevent doing Black Rock sparkle calculations and Egg Rock pulse sounds.
2aa542d2 - Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into marathonmode
4348ebdf - Make live event backup files savedata specific (new format: `live%s.bkp`, where…
271c6d35 - Re-order Marathon bar to be drawn before FPS and captions if applicable.
f06206cd - Fix "press any other key" sending you to HOM hell.
47419ce0 - Introducing "antisplice" - a pair of small highlights on the Marathon bar that…
1e3e9c81 - Remove emblem hints from Marathon Run (I think Options is good just for the sake…
9686ad2d - * In-game timer option! Doesn't tick in intermission or in lag, only when a…
0508f994 - T_PolyObjWaypoint: Move duplicated movement code into its own function
dd3c7aa0 - Fix colormap mipmap memory leak on the character select in OpenGL
00ac9deb - Fix missing sprite column
a615de35 - Correctly reset map/timer for retries where the first map in Marathon Run is…
a5150e07 - * Swap location of Tutorial and Marathon Run, per sphere's suggestion.
8f4ed5af - Merge branch 'nights-character-select' into 'next'
ed9b76e4 - Merge branch 'opengl-character-select-mipmap-memory-leak-fix' into 'next'
69c86c63 - Fix A_SpinSpin not being usable in Lua or SOC due to an error
e422d1fa - Rewrite T_PolyObjWaypoint to move more smoothly
1057c0f7 - T_PolyObjWaypoint: If the polyobject reaches its target exactly, find next waypoint in the same tic
3680b246 - T_PolyObjWaypoint: We can find waypoints in constant time now, so no need to…
06dda9c6 - EV_DoPolyObjWaypoint: Don't discard movement if you start at the last waypoint
536e355c - polywaypointdata_t: Turn reverse and continuous into flags
371a1851 - Polyobject waypoint movement: Prevent infinite loop if all waypoints are in the same location
34d2bd49 - Merge branch 'signspinactiontypo' into 'next'
5d7bea64 - Merge branch 'more-demo-cleanup' into 'next'
9b25ab27 - Merge branch 'stop-sound-by-id' into 'next'
20e4d5ab - lib_sStopSoundByID: fixed mixed declaration and code compiler warning
3c7c758d - Rewrite file transfer code
66ecfb74 - Show total size when downloading gamestate
bf11e3a3 - Add missing packet name
208af4e7 - Merge branch 'fix-packet-name' into 'next'
a7c7f7af - Merge branch 'fof-cleanup' into 'next'
c05d1dd9 - Merge branch 'software-missing-sprite-column' into 'next'
4cd5d760 - Remove linedef type 21 from ZB config (somehow I forgot to do that)
fc07db26 - Store starttic as a raw value in PT_SERVERTICS packets
e49d3d0b - Use per-node reference tics in ExpandTics
56cc5190 - Allow input buffer to hold more than 64 tics
a06c4a8c - Rename P_GetZAt to P_GetSlopeZAt and P_GetZAt2 to P_GetZAt
d0abd6e8 - Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into slope-cleanup
435643b9 - Fix P_GetZAt for Lua
536104fc - Merge branch 'slope-cleanup' into 'next'
8b801921 - Deprecate FixedRem.
d40a8efc - I forgot to test OpenGL
46196468 - Merge branch 'slope-cleanup' into 'next'
ed78d17e - Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
530d0e34 - Remove redundant M_QuitResponse call
33a22331 - Merge branch 'waypoints' into 'next'
6f854f2d - Merge branch 'more-polyobject-cleanup' into 'next'
ff379758 - Merge branch 'next' into movement-refactor
db85c62c - Allow resuming the most recent file transfer
06d3af67 - Refactor Lua file transfer code
dd426827 - remove gxt and gyt, as they are unnecessary
c8320b6c - split "rot" into two variables: frame and rot, for frame number and rotation angle
1a790235 - added basic culling of papersprites if tx for either is too large, proper…
12e10941 - We don't actually need x1 or x2 until these points in the function, at least for papersprites
35e5d673 - do tx checking after tz clamping, not before
65d6b04f - change limits for tx based on fov, by multiplying by fovtan
34c5da39 - Create FIL_ConvertTextFileToBinary
f620b526 - Fix sending Lua files in text mode
c3d57605 - on second thought maybe we don't need extra tx clamping, it turns out to be more…
934b2898 - Add linedef actions 507 & 508, allow using offsets for actions 502-504.
c8948909 - Fix I_Error when queuing multiple Lua files
06060c02 - Add a command to list current file transfers
4eeae51c - Merge branch 'more-lua-map-names' into 'next'
bf009557 - Wait for acks before resending file fragments
702a7041 - also do the fovtan multiplication thing with precip sprites
7722d41b - Merge branch 'sprite-projection-fixes' into 'next'
c9c73270 - A_SplitShot fix: don't even attempt to A_FaceTarget (or anything beyond) if…
4b7f0f49 - added the ability to get the # of a mapthing_t in Lua
46191cad - Update to 2.2.4
0b7f8ca3 - Merge branch 'lua-mapthing-len' into 'next'
747d784c - Merge branch 'splitshot-notarget-fix' into 'next'
d6ea89de - Rename the rest of the wall scrollers in the ZB config.
566a5a0a - Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
b37c73b0 - Make colors UINT16, increase color freeslots to 1024
f508f5b8 - Fix typo SKINCOLOT
ed25fefc - T_BounceCheese: Fix FOF height desync occurring if the FOF fell down too fast…
97cf90b9 - Merge branch 'crumblebob-fixes' into 'next'
40566e69 - Got_AddPlayer: check that I_GetNodeAddress(node) is non-NULL before using strcpy…
bb1e3fdf - Add a few missing calls to GameQuit hook
67eef5a3 - Fix potential desynch when a player spawns
f0b64971 - Merge branch 'next-lc-uint16' into 'next'
1c42102d - Merge branch 'fix-input-buffer' into 'next'
aab6339e - Merge branch 'possibly-fix-dedi-crash' into 'next'
07da7f7d - Merge branch 'scroller-tweaks' into 'next'
755e9d65 - Merge branch 'master' into next
c6e13d0e - Fix crash when setting a mobj's angle from a Lua script
71cf31fc - Fix the "Custom skincolors" branch not compiling with GCC 10.
b7c51634 - Merge branch 'luacolors-gcc10-fix' into 'next'
1dbb7557 - Add dofile() to Lua
7bdea214 - Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
d589e6bc - Fix signpost shade.
ae5d5b95 - Merge branch 'next' into dashmode-fixes
51b640ad - Feedback so far indicates the old booster effect is preferred
b874da52 - Ensure followmobj ghost exists before applying fuse
5136a4d4 - Don't cut momentum if landing in a roll
a7f73bfa - Move drop shadows to the ceiling for objects in reverse gravity
f32d29f7 - Oops, forgot to #undef
1bacaedd - Show the traceback when a Lua script error happens
d3134682 - Refactor hook library a little
5a18bdf2 - Fix SOC color name reading
3a4502fa - Netsync waypoint sequences
508160ed - Use 0 instead of 0xffff as dummy mobjnum
82af11d0 - Merge branch 'waypoint-bruh' into 'next'
dd189155 - Merge branch 'traceback' into 'next'
3c3a60d1 - Fix "downloads" command reporting incorrect progress
8d7f4e32 - Merge branch 'movement-refactor' into 'next'
b13f2985 - Merge branch 'gravflip-shadows' into 'next'
e2b860dc - Merge branch 'next' into 'fix-spawn-desynch'
715cb857 - Merge branch 'next' into 'better-download'
04c7eeb6 - Merge branch 'deprecate-fixedrem' into 'next'
e6ffedbc - Fix food occasionally spawning inside the snake
6895d7df - Merge branch 'next' into 'dofile'
286b316c - Fix dofile() return incorrect values
9be188ff - Minor edit
33ed36cf - Effect 6 flag allows cutting of cyan pixels on FOF and PolyObject planes (even…
9e4ed738 - Sync turnobjs for polyrotate_t thinkers in netgames
71d4eb01 - Merge branch 'polyrotate-turnobjs-sync' into 'next'
7b779fa8 - Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
ca66c5e7 - Updated LUAh_GameQuit
50b47a1b - Merge branch 'translucent-splat-planes' into 'next'
a4d7ff3c - Merge branch 'master' into next
f68a9501 - Merge branch 'next' into nospinmovecut
7e562a3c - Merge branch 'master' into next
28550b22 - Merge branch 'master' into next
82200d80 - Fix mouse being grabbed in the continue screen.
176361de - Merge branch 'shader-skywalls' into 'sal-oglshaderport'
db32b012 - Merge branch 'renderstats' into 'sal-oglshaderport'
da98ea24 - Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge
de7a806e - Merge branch 'nospinmovecut' into 'next'
abe13651 - OpenGL draw call batching system
0e521922 - Change some unsigned ints to UINT32
78014cfd - Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
590dfca5 - Merge branch 'fix-continuing-mouse' into 'next'
614a98bd - Merge branch 'dashmode-fixes' into 'next'
191e2e09 - Merge branch 'fix-spawn-desynch' into 'next'
405f1550 - Merge branch 'shaders-224-next-merge' into 'sal-oglshaderport'
ce17cc48 - Merge branch 'ogl-batching' into 'sal-oglshaderport'
62d73968 - Merge branch 'next' into sal-oglshaderport
3dd89f67 - Fix no previous prototype for TimeFunction
2abdc865 - Fix these "may be used uninitialized in this function" errors with batching
291479e3 - Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
bc2edb2a - Merge branch 'snake' into 'next'
7ffee074 - Merge branch 'next' into 'better-download'
38a8fe2b - Merge branch 'better-download' into 'next'
08e9efee - Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
0d70e16b - Updated LUAh_GameQuit to use new error handler
c810ea39 - Merge branch 'next-lc-uint16' into 'next'
b056bf1d - Merge branch 'master' into next
23226444 - Merge branch 'dofile' into 'next'
965d42f9 - Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
6eccc703 - I forgot to pop the error handler
d3d5496a - Fix facecolor may be used uninitialized.
a34be0e3 - Reduce code duplication by creating get_zlib_error function
f626b9f4 - Fix VGZ sometimes causing SRB2 to crash by not playing the song early in I_LoadSong
5708325d - Use SAMPLERATE for consistency with the rest of the code
3946309e - Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into sal-oglshaderport
1e655fb2 - Better fix for may be used uninitialized, maybe fixes GCC 4.x
8365d975 - A even more better fix for this
5a52f9cb - Merge branch 'sal-oglshaderport' into 'next'
bff6b190 - Merge branch 'marathonmode' into 'next'
9477d372 - Backwards compatibility for shaderless hardware
ffaffdf3 - Faster and more correct OGL transparent surface sorting
8063814f - Merge branch 'shaderless-support-next' into 'next'
47d9d876 - Fix the Eggman signpost's background color
cab87b46 - lol should have tested before pushing
6f9b9aac - Faster OGL sprite sorting algorithm
f3212746 - Don't repeatedly look for model texture files
e9e9cd61 - Give ACZ3 boss MF_NOCLIP(HEIGHT) when entering pinch phase, to prevent softlocking.
80e0d353 - Fix missing bruh string in lua side options. This is stupid.
7d2de839 - Merge branch 'lua-side-enum-bruh' into 'next'
5ef8c95c - Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
ac71bb76 - Merge branch 'gme-cleanup-fixes' into 'next'
2e827705 - Merge branch 'ogl-drawnode-fix' into 'next'
9eb8fd8a - Merge branch 'fixeggsign' into 'next'
95cc10d7 - Merge branch 'ogl-mdl-tex-repeat-search-fix' into 'next'
207d8aee - Merge branch 'acz3-softlock-fix' into 'next'
b14f18c1 - Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
067d9b9a - Merge remote-tracking branch 'origin/next' into gtr-fixes
8c3e2728 - Merge branch 'gtr-fixes' into 'next'
7317bbb6 - Merge branch 'ogl-sprite-qsort' into 'next'
b973b432 - Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
0435acd5 - Merge branch 'gamequit-hook' into 'next'
1e3b84b6 - Fix the Master Server so it works
52f193b7 - Allow multiple ports to host under one IP address.
669e59ea - Fix small inconsistency

Compare with previous version

added 156 commits

669e59ea...f336b1e9 - 132 commits from branch STJr:master
288d7166 - Fix ASTBlendPixel outputting empty pixels if the background pixel was empty, BUT…
c64e231b - Attempt to properly match Software texture blending
42349438 - Fix mistake
32773b71 - Use ordered ids instead of hashes for cvar netid
32134a01 - Save cvar names in demos; refactor cvar loading
db34d70f - Cvar compatibility with older demos
3e527649 - Actually print a warning if the old demo id collides
7ec0b6c7 - I meant consvar_number_of_netids to be exclusive :V
b29873ce - Better MF2_LINKDRAW support for OpenGL
e741a7b3 - Actually save the cvar name in demos
d9005203 - Fuck you macro
b4aa5cec - Merge remote-tracking branch 'upstream/next' into ogl-linkdraw
3a4ce6ae - Merge remote-tracking branch 'origin/next' into opengl-blending-fix
d392c599 - Changed Bubble Shield functionality
be8f0853 - Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2 into bubbleshieldoverhaul
5fdc4578 - Merge remote-tracking branch 'upstream/next' into ogl-linkdraw
df98601b - Merge branch 'bubbleshieldoverhaul' into 'next'
8bcc2662 - Merge branch 'netid-take-2' into 'next'
6a54e5f4 - Merge remote-tracking branch 'origin/master' into next
6c366381 - Merge branch 'ogl-linkdraw' into 'next'
84373b17 - Merge branch 'opengl-blending-fix' into 'next'
f1627c4c - Fix the Master Server so it works
5cc3ca1a - Allow multiple ports to host under one IP address.
a8c3d639 - Fix small inconsistency

Compare with previous version

It looks like some stuff from next is in here?

tbh this should probably target next IMO

gonna rebase this to next since this is getting some attention

changed target branch from master to next

added 30 commits

a8c3d639...42b0ab18 - 27 commits from branch STJr:next
fcfc4320 - Fix the Master Server so it works
48894de5 - Allow multiple ports to host under one IP address.
b284f3fe - Fix small inconsistency

Compare with previous version

actually i don't see why this couldn't be master, so going back lmao

added 8 commits

b284f3fe...6f8dfb6f - 5 commits from branch STJr:next
5f85c722 - Fix the Master Server so it works
66929c3c - Allow multiple ports to host under one IP address.
a02306b6 - Fix small inconsistency

Compare with previous version

changed target branch from next to master

alright, now targetting master correctly after manually rebasing

(cause git rebase didnt like me switching from next to master)

merged

mentioned in commit d013dd0d

Fix the Master Server so it works

Merge request reports

Activity