Commit graph

9547 commits

Author SHA1 Message Date
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
596ff92e69 Name the archive like the EXE 2020-01-23 21:06:48 -08:00
James R
f3ffc2f82b Windows is dumb so no colon
srb2win-jameds-appveyor-exename-0a41f77a2.exe
2020-01-23 20:35:53 -08:00
James R
98297f3de2 Check if this actually is a PR before using those variables 2020-01-23 20:34:26 -08:00
James R
56abe74c18 I promise I know what I'm doing 2020-01-23 20:13:57 -08:00
Tatsuru
96a33f315c I don't know how these even come up 2020-01-24 01:03:38 -03:00
James R
745f4b6492 Use the pull request repo, branch and commit
srb2win-jameds:appveyor-exename-0a41f77a2.exe
2020-01-23 19:58:26 -08:00
James R
0a41f77a22 Well I'm an idiot 2020-01-23 18:55:25 -08:00
James R
a5d62ef3bb Put the abbreviated commit hash in the EXENAME for AppVeyor
srb2win-master-003f3769d.exe
2020-01-23 18:10:31 -08:00
James R
12da266baa Put branch name and commit hash in EXENAME for AppVeyor builds
srb2win-master-003f3769dfc531eae0071c07e45803c17fd53460.exe
2020-01-23 18:01:59 -08: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
Bartu İnce
15ecc1358a no message 2020-01-22 22:08:08 +01:00
Bartu İnce
5d32334164 "page x of y" 2020-01-22 21:57:28 +01:00
Bartu İnce
15f1636be5 Extra emblems display, take 2. 2020-01-22 21:52:15 +01:00
Bartu İnce
2337393211 Added support for 10+ emblem hints 2020-01-22 18:53:17 +01: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
SteelT
003f3769df Merge pull request #447 from ConfusionAlphaX/local-resynch-fix
Fix title screen broken when leaving during resynch
2020-01-21 19:09:15 -05:00
James R
08ba4ece8e Don't check "Too many flats in level" with P_AddLevelFlatRuntime
Also moved the debug down in case anyone uses that.
2020-01-21 15:35:07 -08:00
James R
4e5644335a Revert "Fix Ploadflat closing the game with "Too many flats in level" error message"
This reverts commit 51c7074247.
2020-01-21 15:35:07 -08:00
James R
ed6ca997e2 Sonic is dead again 2020-01-21 12:24:24 -08:00
James R
47b0381c99 Reorder Sonic's ass so the OpenGL wipe doesn't see garbage 2020-01-21 12:23:34 -08:00
James R
ad88e8793e (BRUH MOMENT) activettscale was -1, so do recache after it's set 2020-01-21 12:21:18 -08:00
Zwip-Zwap Zapony
d1c7b9a4a8 Separate "turnmultiplier"s for splitscreen players
This fixes player 2 using player 1's "cam_turnmultiplier"
instead of player 2's "cam2_turnmultiplier"
2020-01-21 14:53:05 +01:00
James R
99ad30796c Trim the trailing zeros off floats for cvars 2020-01-20 23:14:26 -08:00
James R
c26ed0db5a Remove unnecessary optimization 2020-01-20 15:36:27 -08:00
James R
3fb54559ed Merge branch 'gl-dropshadows' into 'next'
OpenGL drop shadows

See merge request STJr/SRB2!703
2020-01-20 16:52:40 -05:00
Zwip-Zwap Zapony
f7718ea1dc Fix "cam2_turnmultiplier"
In splitscreen stuff, player 2's "cam2_turnmultiplier" implementation
was wrong compared to player 1's "cam_turnmultiplier"
This commit makes player 2's multiplier work just like player 1's does
2020-01-20 16:14:20 +01:00
Tatsuru
0740af6914 Die 2020-01-20 10:04:44 -03:00
Tatsuru
a11d4f48c5 Remove Tails pick-up lock 2020-01-19 23:18:49 -03:00
Tatsuru
38ca47891a Turn cv_exitmove on by default 2020-01-19 21:56:53 -03:00
Tatsuru
2d7d8fc1b1 HUD visual indicator + property fix 2020-01-19 21:55:08 -03:00
Tatsuru
065b8adf42 In-map visual indicator 2020-01-19 19:02:03 -03:00
Tatsuru
b37fc4573a No more losing lives when finished 2020-01-19 14:30:05 -03:00
Confusion
db4cc87be7 Fix title screen broken when leaving during resynch 2020-01-19 17:55:22 +03:00