Commit graph

8166 commits

Author SHA1 Message Date
James R
c19fe1419f Remove code that does effectively nothing 2020-01-31 14:35:19 -08:00
James R
ff2ec925ee Merge remote-tracking branch 'origin/master' into next 2020-01-30 23:54:56 -08:00
James R
020751fdc1 Merge branch 'i-can-see-myself' into 'master'
Don't draw yourself in first person!

See merge request STJr/SRB2!697
2020-01-31 02:34:11 -05:00
James R
1d8d20d915 Merge branch 'opengl-skipintro-sigabrt' into 'master'
Fix crash when using -skipintro and the renderer is set to OpenGL from config

See merge request STJr/SRB2!714
2020-01-31 02:34:08 -05:00
James R
ee35b1cf3b Merge branch 'cybrak_flamedmg' into 'next'
Fix damagetype for Cybrak flamethrower.

See merge request STJr/SRB2!731
2020-01-31 02:34:05 -05:00
James R
ebd53ace47 Merge branch 'angle-clamp' into 'master'
Fix the minecart angle thing in netgames

Closes #69

See merge request STJr/SRB2!732
2020-01-31 02:33:59 -05:00
James R
510ed5353d Merge branch 'ttfixes2' into 'next'
Fix title card not showing up at all if focus lost

See merge request STJr/SRB2!736
2020-01-31 02:33:57 -05:00
James R
f8cccef6c3 Merge branch 'ntsatkbgfix' into 'master'
Fix M_DrawNightsAttackMountains integer overflow

See merge request STJr/SRB2!737
2020-01-31 02:33:53 -05:00
James R
0c614dbd90 Merge branch 'startcontinue' into 'master'
Fix F_StartContinue fading out incorrectly in OpenGL

See merge request STJr/SRB2!738
2020-01-31 02:33:51 -05:00
Steel Titanium
c49d01a324 Fix memory leak while chat is on screen 2020-01-30 22:11:50 -05:00
SteelT
b4809e2e43 Merge branch 'dehacked-hud-fix' into 'next'
Fix missing "RINGSNUMTICS" in dehacked.c's HUD items

See merge request STJr/SRB2!733
2020-01-28 20:25:07 -05:00
Louis-Antoine
38e048466f Only call P_CheckSurvivors() in tag gametypes 2020-01-28 14:02:36 +01:00
Jaime Passos
5da3b2a0e7 Fix F_StartContinue fading out incorrectly in OpenGL 2020-01-27 13:28:07 -03:00
Jaime Passos
ada3f58d25 Fix M_DrawNightsAttackMountains being broken for obvious reasons 2020-01-27 00:44:10 -03:00
Jaime Passos
cfafdf7bed Fix title card not showing up at all if focus lost 2020-01-26 23:50:36 -03:00
Jaime Passos
447ee1a04c Remove redundancy 2020-01-26 23:46:07 -03:00
Monster Iestyn
eca4bc63da Merge branch 'master' into next
# Conflicts:
#	src/g_game.c
2020-01-26 19:23:05 +00:00
Zwip-Zwap Zapony
ff57802823 Fix missing "RINGSNUMTICS" in dehacked.c
This fixes 16/20 of the HUD items in dehacked.c being off by one
(Same case as the MFE_ flags thing)
Also fixes dehacked.c mentioning "LAPS", which doesn't exist
2020-01-26 10:53:37 +01:00
fickleheart
124077f1d9 Fix the minecart angle thing 2020-01-25 19:03:15 -06:00
toaster
6d3f0c6a90 Make the DMG actually *applied*. Consequence: flame will continue flying through player instead of dying in midair and dropping a flame, but this is actually desirable given the current behaviour looks kind of shitty. 2020-01-25 11:34:30 -05:00
toaster
46d217b731 Fix damagetype for Cybrak flamethrower. 2020-01-25 11:31:06 -05:00
Nev3r
242b5b0168 Merge branch 'credits-again' into 'next'
Credit Tatsuru

See merge request STJr/SRB2!728
2020-01-25 08:54:41 -05:00
Louis-Antoine
e04596d611 Fix lava removing fire shield 2020-01-25 14:04:16 +01:00
SteelT
0cba39d7a4 Merge branch 'opengl-garbage-fade' into 'master'
Fix garbage fade on Sonic's ass in OpenGL

See merge request STJr/SRB2!715
2020-01-25 00:51:07 -05:00
James R
87a278ad02 Signed is unsigned, cool 2020-01-24 16:44:53 -08:00
James R
cc5fa4c685 Credit Tatsuru, he's done a bit 2020-01-24 16:38:46 -08:00
LJ Sonic
0beae26e9d Merge branch 'keep-body' into 'next'
Let clients rejoin the server without losing their status

See merge request STJr/SRB2!722
2020-01-24 18:50:03 -05:00
SteelT
ad00bc7000 Merge branch 'key-out-of-range' into 'master'
Don't set controls to keys of array bounds

See merge request STJr/SRB2!723
2020-01-24 18:45:19 -05:00
LJ Sonic
09fc88f03a Merge branch 'point-in-subsector-or-null' into 'next'
Rename R_IsPointInSubsector to R_PointInSubsectorOrNull/Nil

See merge request STJr/SRB2!719
2020-01-24 17:08:30 -05:00
SteelT
13c00969dc Merge branch 'musicdef-versioning' into 'next'
MUSICDEF cleanup, fixes, and VERSION directive to opt into new format

See merge request STJr/SRB2!708
2020-01-24 17:06:58 -05:00
SteelT
260de0fca4 Merge branch 'player2-turn-fix-next' into 'next'
Fix "cam2_turnmultiplier" being unused in "next"

See merge request STJr/SRB2!713
2020-01-24 17:04:20 -05:00
SteelT
e47a0313d7 Merge branch 'player2-turn-fix' into 'master'
Fix "cam2_turnmultiplier"

See merge request STJr/SRB2!711
2020-01-24 17:04:06 -05:00
SteelT
03be093a38 Merge branch 'ploadflat-bruh-bruh' into 'master'
Fix P_AddLevelFlatRuntime again

See merge request STJr/SRB2!717
2020-01-24 17:00:09 -05:00
SteelT
a0d8b7ec24 Merge branch 'fix-mouse-controls-setup' into 'master'
Fix mouse in controls setup menu

See merge request STJr/SRB2!706
2020-01-24 16:58:06 -05:00
MascaraSnake
383eccd630 Merge branch 'master' into next 2020-01-24 22:37:25 +01:00
Louis-Antoine
ba0a02d2b3 Be silent when "kicking" a disconnected player
This lets the host manually remove a body if they want,
without polluting the chat with redundant messages.
2020-01-24 19:56:57 +01:00
James R
128f0757b6 Semantics 2020-01-23 13:57:39 -08:00
Louis-Antoine
a04004071b Do not spam player quit net commands 2020-01-23 19:59:41 +01:00
Louis-Antoine
bb157866b7 Ignore disconnected players in tag gametypes
Disconnected players do not become IT at round start.

If all non-ITs are disconnected, the round ends.

If all ITs are disconnected, one of the non-ITs
becomes IT, or the round ends if in Hide & Seek.
2020-01-23 19:58:13 +01:00
Louis-Antoine
f98be013ea Do not protect non-IT players in tag gametypes 2020-01-23 18:52:16 +01:00
James R
a127045d98 Don't set controls to keys out of array bounds
Shout-out to TAG's config that somehow had
`setcontrol2 "custom3" "KEY931926528"`, cuasing the game to crash only in
Splitscreen.
2020-01-22 22:19:00 -08:00
Louis-Antoine
f07b432df4 Rename R_IsPointInSubsector to R_PointInSubsectorOrNull/Nil
The old name made it really easy to accidentally read
R_IsPointInSubsector as R_PointInSubsector, and anyway it
didn't even make sense...
2020-01-22 16:58:57 +01:00
Louis-Antoine
93ac266be1 Fix missing declaration 2020-01-22 04:01:06 +01:00
Louis-Antoine
a997683d1c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into keep-body
# Conflicts:
#	src/g_game.c
#	src/p_setup.c
2020-01-22 03:57:22 +01:00
Louis-Antoine
8dbd4794c1 Teleport disconnected players to starpost if they fall in a pit 2020-01-22 03:20:27 +01:00
Louis-Antoine
7d615ed94b Refactor player spawning code a little 2020-01-22 03:19:15 +01:00
Louis-Antoine
08589dcd96 Give flashing tics to disconnected players and prevent drowning 2020-01-22 03:14:44 +01:00
Louis-Antoine
bb74b090cb Ignore players towards exit count 30 seconds after their disconnection 2020-01-22 03:11:05 +01:00
Louis-Antoine
c2682ac1b6 Let clients rejoin the server without losing their status
This is accomplished by simply preserving
the player's body after disconnecting.

Bodies will despawn after the number of minutes
specified by the "rejointimeout" console variable (float).
A value of 0 disables the feature completely.

Clients rejoining are identified by their IP address,
and may rejoin even if the server is full or joins are disabled,
for as long as their body remains.

From a technical standpoint, when the user disconnects,
the player they were controlling does not leave,
the underlying player_t just keeps working normally,
except it does not receive any input anymore.
When the user reconnects, they are simply "relinked"
to their player_t.

Those "soulless" players can be identified through
their "quittime" field, which is the number of tics
elapsed since the user disconnected, or zero
if still connected. "quittime" is exposed to Lua.
2020-01-22 03:05:08 +01:00
James R
f906a7bcce Actually actually match the old behavior and check existing levelflats in P_AddLevelFlatRuntime BRUH 2020-01-21 16:47:47 -08:00