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
James R
06f75ca73a
Merge branch 'add-exitmove-to-menu' into 'next'
...
Put cv_exitmove in the server options menu
See merge request STJr/SRB2!704
2020-01-19 02:18:49 -05:00
James R
0fdbc9498f
Opt into new MUSICDEF format (2.2.0 compatibility)
...
The "VERSION" directive enables features available in a certain version of
SRB2. It may be used as "VERSION 2.2.0".
2020-01-18 23:12:30 -08:00
James R
9aa551cc2b
Refactor MUSICDEF parsing, actually count lines
...
If you use strtok for (CR)LF, it'll skip the empty lines bruh.
2020-01-18 22:17:47 -08:00
Louis-Antoine
4777829d45
Fix mouse in controls setup menu
2020-01-18 20:18:20 +01:00
fickleheart
52b60d90b0
Fix loss of aimingtody precision at high FOV
2020-01-18 11:19:59 -06:00
fickleheart
dcc66de65d
Use generally higher zooms and fix fuzzy edges
2020-01-18 11:15:36 -06:00
fickleheart
b5b902e064
Reduce the number of distinct roll angles
2020-01-18 10:53:45 -06:00
fickleheart
964458e981
Remove a couple adds from each pixel of morph mapping
2020-01-18 10:53:23 -06:00
fickleheart
3cb64aeb77
Fully clip drawing to roll-used screen bounds
2020-01-18 10:53:00 -06:00
Tatsuru
a4215645f7
Goal posts
2020-01-18 13:15:24 -03:00
LJ Sonic
9f1b3ca753
Merge branch 'mapthingflagextradehackedconstant' into 'next'
...
Mapthing flag EXTRA DeHackEd constant
See merge request STJr/SRB2!705
2020-01-18 10:31:29 -05:00
Jaime Passos
24f8f69218
Fix missing constant
2020-01-18 12:10:48 -03:00
Tatsuru
d70a76bacd
Put cv_exitmove in the menus
2020-01-18 12:06:04 -03:00
James R
6d42b011e8
Let "+" command line parameters specify more than one argument
...
Previously each parameter after the first would be quoted into one argument to
pass to the command buffer.
2020-01-18 00:23:47 -08:00
fickleheart
54a844a59e
Fix lighting discrepancies between different FOVs
2020-01-18 00:16:18 -06:00
James R
8de506ee1c
Merge branch 'intangable' into 'next'
...
Add FF_INTANGABLEFLATS as an alternative spelling for FF_INTANGIBLEFLATS
See merge request STJr/SRB2!702
2020-01-18 00:49:08 -05:00
fickleheart
e0a6e7ec74
Avoid rendering unused left/right edges of screen while rolling
2020-01-17 23:21:11 -06:00
James R
ef459ba647
Don't draw Tails' tails in first person (MF2_LINKDRAW)
2020-01-17 20:56:32 -08:00
James R
a1a6956618
Duplicated code is gone, so sad
2020-01-17 20:53:36 -08:00
fickleheart
a5976b09ec
Fix sky texture scaling wrong with fov changes
2020-01-17 22:03:16 -06:00
fickleheart
3d432b4c60
I think this fixes the compile errors
2020-01-17 21:55:16 -06:00
Sally Cochenour
664fb9cf6e
Use shadow cvar
2020-01-17 22:20:04 -05:00
Sally Cochenour
60795e5a2f
Merge branch 'next' into gl-dropshadows
2020-01-17 22:19:51 -05:00
fickleheart
4ab0301202
Fisheye lens experiments
2020-01-17 20:39:38 -06:00
fickleheart
b74ff9eb73
Add DBG_VIEWMORPH to view pre-transformed view
2020-01-17 20:39:15 -06:00
