James R
eec6a82882
strtok can return NULL
2020-05-13 17:18:27 -07:00
James R
f9260dedee
This time I fucked up
2020-05-13 17:18:27 -07:00
James R
be4dda2fc4
Windows gaysed: the sequel
2020-05-13 17:18:27 -07:00
James R
975165c424
Windows is weird
2020-05-13 17:18:27 -07:00
James R
a5d65b2ede
masterserver_debug to set CURLOPT_VERBOSE
2020-05-13 17:18:27 -07:00
James R
d2590e3a76
Don't show "All" room when hosting
2020-05-13 17:18:27 -07:00
James R
77642a7cda
I don't even know my own website
2020-05-13 17:18:26 -07:00
James R
6f9b548840
lol
2020-05-13 17:18:26 -07:00
James R
65ff8e2f00
The big bad HTTP master server
...
Cvars:
http_masterserver is the url to the master server's API.
masterserver_token may be an authentication token.
2020-05-13 17:18:26 -07:00
kaysrishaq
f6addb956e
musicpref console variable
...
Adds musicpref to console and sound options menu, which allows users to select whether to prioritize MIDI or Digital music.
Functions GameMIDIMusic_OnChange and GameDigiMusic_OnChange updated to not assume digital music priority, and to have more consistent behavior between the two.
Positive side effect of using P_RestoreMusic in these functions means that powerup music (speed shoes, invincibility) will restore in the correct position when reenabling the original MusicType they loaded in with.
2020-05-13 19:20:21 -04:00
MascaraSnake
93b6615e61
Store PolyObject waypoint return behavior in an enum
2020-05-13 16:21:47 +02:00
MascaraSnake
ea0176fada
Remove diffx/y/z from polywaypoint_t, since they're always 0 anyway
2020-05-13 14:40:07 +02:00
MascaraSnake
14608b0f49
Merge branch 'actnum-tweaks' into 'next'
...
Act number tweaks
See merge request STJr/SRB2!905
2020-05-13 04:25:53 -04:00
MascaraSnake
7ea005fdc1
Merge branch 'fix-window-icon' into 'master'
...
Fix window icon being reset when switching renderers on non-Windows platforms
See merge request STJr/SRB2!898
2020-05-13 04:14:51 -04:00
MascaraSnake
bbded108ef
Merge branch 'ogl-gif-fix' into 'master'
...
Fix OpenGL only recording the first frame of unoptimized GIFs
See merge request STJr/SRB2!928
2020-05-13 04:09:58 -04:00
MascaraSnake
9ead3a8b47
Merge branch 'udmf-next' into executordelay
2020-05-13 10:01:41 +02:00
MascaraSnake
c2037391d2
Merge branch 'next' into udmf-next
2020-05-13 10:01:12 +02:00
MascaraSnake
2e9a6afa3e
Merge branch 'udmf-next' into executordelay
...
# Conflicts:
# src/p_spec.c
2020-05-13 09:55:25 +02:00
MascaraSnake
2e8bb50808
Fix accidental swap of first and last waypoint
2020-05-13 09:32:00 +02:00
MascaraSnake
7004d8ca75
Merge branch 'next' into waypoints
2020-05-12 23:51:32 +02:00
MascaraSnake
4c526f6e50
Store waypoints (for zoom tubes, rope hangs, polyobjects) explicitly
2020-05-12 23:50:30 +02:00
Louis-Antoine
3d08ffe514
Rename local variables
2020-05-12 19:58:16 +02:00
Monster Iestyn
86e2053dcd
added missing extern keyword for ntemprecords in doomstat.h (definition is in g_game.c)
2020-05-12 18:43:49 +01:00
Monster Iestyn
be0e7e63bf
added missing extern keyword for ms_RoomId in mserv.h (the definition is already in the .c file in this case)
2020-05-12 18:42:16 +01:00
Monster Iestyn
6878220a1b
turn all non-extern variables in s_sound.h into externs (and put their real definitions in the .c file)
2020-05-12 18:40:51 +01:00
Monster Iestyn
62a640e282
make savegamename in doomdef.h an extern, put the actual definition in d_main.c
2020-05-12 18:37:15 +01:00
Louis-Antoine
70f4d12d38
Rename some file transfer functions
2020-05-12 19:06:40 +02:00
sphere
948582ce4e
Restore SHORT().
2020-05-12 17:20:29 +02:00
sphere
4d9d125a99
Fix some errors and add some comments. Also, actnum is not an INT32.
2020-05-12 17:20:28 +02:00
sphere
21130dfbb0
Support act numbers up to 99 and draw both digits individually.
2020-05-12 17:17:24 +02:00
MascaraSnake
999ebe2fd1
Rename variables for Fang waypoints, in preparation for new global waypoint data structure
2020-05-12 14:53:10 +02:00
Steel Titanium
a491f20bee
Merge branch 'master' into next
2020-05-11 18:20:09 -04:00
SteelT
a43072a853
Merge branch 'splitscreen-titlecards-fix' into 'master'
...
Fix splitscreen Title Card act name regression
See merge request STJr/SRB2!934
2020-05-11 18:18:22 -04:00
SteelT
9e93ab4cf5
Merge branch 'menu-soc-bullshit-mergefix' into 'master'
...
Menu soc bullshit mergefix
See merge request STJr/SRB2!933
2020-05-11 18:17:59 -04:00
James R
4753c9042d
Merge remote-tracking branch 'origin/next' into 2.2.4-prep
2020-05-11 15:01:32 -07:00
Louis-Antoine
be67ca3203
Fix crash with rollout rock
2020-05-11 23:48:35 +02:00
James R
e95d2beed7
Update patch.pk3 asset hash
2020-05-11 14:41:36 -07:00
James R
ffd88746da
Update version names, SUBVERSION, MODVERSION
2020-05-11 14:41:36 -07:00
Monster Iestyn
ce3639f569
Merge branch 'master' into next
2020-05-11 20:08:02 +01:00
Zwip-Zwap Zapony
cb9d0a2fbe
Fix splitscreen Title Card act name regression
...
This fixes act names not being shown on player 2's view
2020-05-11 19:57:20 +02:00
MascaraSnake
35b4f88efe
Merge branch 'fix-simple-camera-and-eggstatue' into 'next'
...
Fix Simple Camera not working with the tutorial's statue challenge
See merge request STJr/SRB2!931
2020-05-11 13:31:09 -04:00
toaster
67e01ad66e
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2.git into fickleheart/SRB2-menu-soc-bullshit
...
# Conflicts:
# src/m_menu.c
2020-05-11 15:00:31 +01:00
James R
1065ded275
Remove instances of HAVE_BLUA that actually disable Lua now
2020-05-10 19:59:56 -07:00
James R
5ad69621f2
Use camera angle, not mobj angle, when comparing Angle Anchor
2020-05-10 19:40:28 -07:00
sphere
0490dc3e8e
Don't show the FPS counter during startup.
2020-05-11 01:33:34 +02:00
Steel Titanium
f9195d6593
Merge branch 'next' into 2.2.3-prep
2020-05-10 17:05:56 -04:00
Monster Iestyn
d591b56ef4
Merge branch '2.2.3-prep' of git@git.magicalgirl.moe:STJr/SRB2.git into 2.2.3-prep
2020-05-10 20:10:11 +01:00
Monster Iestyn
1ea3a031da
Last minute OpenGL fix: don't check flippedness in HWR_RotateSpritePolyToAim if the mobj is actually a precipmobj!
...
precipmobj_t does not have eflags, so P_MobjFlip checking it would actually be accessing memory addresses beyond the end of the struct
2020-05-10 20:09:08 +01:00
lachwright
a4cba6a5f9
Merge branch 'master' into next
2020-05-11 01:29:10 +08:00
Lachlan Wright
7df8c24a9b
Merge branch 'patch_music' into 'next'
...
patch_music.pk3
See merge request STJr/SRB2!812
2020-05-10 12:51:49 -04:00
