f209721ded
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
2527b6c389
Teleport disconnected players to starpost if they fall in a pit
2020-01-22 03:20:27 +01:00
412ba38a81
Refactor player spawning code a little
2020-01-22 03:19:15 +01:00
d03c928baa
Give flashing tics to disconnected players and prevent drowning
2020-01-22 03:14:44 +01:00
73d0549fa4
Ignore players towards exit count 30 seconds after their disconnection
2020-01-22 03:11:05 +01:00
d374bf4f9b
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
0d460aed1d
Merge branch 'gl-dropshadows' into 'next'
...
OpenGL drop shadows
See merge request STJr/SRB2!703
2020-01-20 16:52:40 -05:00
a7770c3e97
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
8348123a70
Goal posts
2020-01-18 13:15:24 -03:00
eed69ab94d
Merge branch 'mapthingflagextradehackedconstant' into 'next'
...
Mapthing flag EXTRA DeHackEd constant
See merge request STJr/SRB2!705
2020-01-18 10:31:29 -05:00
cdc3386d48
Fix missing constant
2020-01-18 12:10:48 -03:00
0c7c5742a8
Put cv_exitmove in the menus
2020-01-18 12:06:04 -03:00
e82d19572d
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
43828f265c
Use shadow cvar
2020-01-17 22:20:04 -05:00
ba51f83aaf
Merge branch 'next' into gl-dropshadows
2020-01-17 22:19:51 -05:00
9a1cb0e30e
Merge branch 'software-dropshadows' into 'next'
...
Software dropshadows
See merge request STJr/SRB2!660
2020-01-17 18:56:13 -05:00
96c91ce716
Merge branch 'r_ispointinsubsector' into 'next'
...
Add R_IsPointInSubsector to lua baselib
See merge request STJr/SRB2!700
2020-01-17 18:24:04 -05:00
999094f2f6
backwards compat
2020-01-17 16:11:17 -03:00
b09341383f
Merge branch 'master' into next
2020-01-17 11:12:10 -05:00
b38921ff53
Merge branch 'mserv-is-dumb-and-what-else-is-new' into 'master'
...
Fuck NONET
See merge request STJr/SRB2!699
2020-01-17 11:11:02 -05:00
14c8fdd3aa
Merge branch 'intangable' into 'next'
...
Fix FF_INTANGABLEFLATS typo
See merge request STJr/SRB2!701
2020-01-17 03:13:45 -05:00
f59ed6b2f4
DOUBLE DAMNIT
2020-01-17 00:34:57 -06:00
d39d8506ca
Let nerds turn off shadows
2020-01-17 00:20:10 -06:00
919661ff8f
Give me a break
2020-01-17 00:18:00 -06:00
4ca44f2d57
Bosses need dropshadows too
2020-01-17 00:16:15 -06:00
9a4ad20947
DAMNIT
2020-01-17 00:13:13 -06:00
f0843cba13
Let vissprites have shadows too
...
fuck it, hopefully it works
2020-01-17 00:13:05 -06:00
8bfdb52231
add R_IsPointInSubsector to lua baselib
2020-01-17 00:49:43 -03:00
7adc108a2a
typoe
2020-01-17 00:34:31 -03:00
e4f0fa46f5
Dumbass NONET stuff...
2020-01-16 18:07:28 -08:00
b6f68be52c
Merge branch 'credits-woopises' into 'next'
...
Add missing name to the credits
See merge request STJr/SRB2!696
2020-01-16 20:33:35 -05:00
098e41e518
Merge branch 'larger-chat' into 'master'
...
Larger chat
See merge request STJr/SRB2!691
2020-01-16 20:33:09 -05:00
d4e0bfe87f
Merge branch 'snac-bruh' into 'master'
...
Try to set a 21 character name and SIGABRT
See merge request STJr/SRB2!689
2020-01-16 20:32:58 -05:00
d7b6a3dd61
Merge branch 'mserv-is-dumb-and-what-else-is-new' into 'master'
...
-bindaddr for mserv
See merge request STJr/SRB2!688
2020-01-16 20:32:49 -05:00
b97b9ac7a8
Merge branch 'master' into next
2020-01-16 20:18:54 -05:00
d9742afb45
Merge remote-tracking branch 'origin/next' into next
2020-01-16 20:17:58 -05:00
daab7a0d21
Merge remote-tracking branch 'origin/master'
2020-01-16 20:17:05 -05:00
f93ddc3f37
Merge branch 'keywords-back-again' into 'next'
...
Level header keywords
See merge request STJr/SRB2!656
2020-01-16 20:05:24 -05:00
f8666d6cee
Merge branch 'word' into 'master'
...
Word jumping
See merge request STJr/SRB2!653
2020-01-16 20:05:12 -05:00
601d4aec34
Merge branch 'FALLTHRU' into 'next'
...
FALLTHRU versus fallthru, which will win?
See merge request STJr/SRB2!692
2020-01-16 19:59:00 -05:00
1be648578f
Merge branch 'clear-sign-sprite' into 'next'
...
Add generic signpost sprite for skins that don't have one
See merge request STJr/SRB2!626
2020-01-16 19:57:54 -05:00
51f1f4f2b1
Also check ALTTITLE
2020-01-16 16:46:31 -08:00
90c9a467f3
Bah it's a new year!
2020-01-16 16:45:52 -08:00
1f36bde25f
Merge branch 'musicdef' into 'next'
...
MUSICDEF parser changes.
See merge request STJr/SRB2!599
2020-01-16 19:35:38 -05:00
f9dd5056c6
musicdef-2.2.1 for converting 2.2.0 MUSICDEF to new format
2020-01-16 16:36:10 -08:00
54ec64062c
Revert "Move to the end of the list"
...
This reverts commit 32c65ae844
2020-01-16 19:20:05 -05:00
32c65ae844
Move to the end of the list
2020-01-16 18:59:39 -05:00
4c6edd87df
Restore this that got removed shomehow
2020-01-16 14:31:36 -05:00
36511afda9
Add missing name to the credits
2020-01-16 14:28:47 -05:00
4e481340ce
OpenGL shadows
2020-01-16 12:37:32 -05:00
Louis-Antoine