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
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
Tatsuru
38ca47891a
Turn cv_exitmove on by default
2020-01-19 21:56:53 -03:00
Tatsuru
065b8adf42
In-map visual indicator
2020-01-19 19:02:03 -03:00
Alam Ed Arias
43a78e6821
Merge branch 'master' into next
2020-01-17 11:12:10 -05:00
James R
73852fc767
Update buffer for SendNameAndColor
2020-01-14 21:40:58 -08:00
James R
7daf24fcb8
Merge remote-tracking branch 'origin/master' into next
2020-01-12 14:17:52 -08:00
LJ Sonic
fd18f1cb7f
Merge branch 'fix-node-player-mixups' into 'master'
...
Fix node player mixups
See merge request STJr/SRB2!684
2020-01-12 15:57:20 -05:00
Louis-Antoine
82876c2eff
Replace all instances of XD_KICK with a SendKick function
2020-01-12 19:43:04 +01:00
Tatsuru
445269ce14
Expose colorization to mappers and SOC
2020-01-11 20:40:57 -03:00
fickleheart
067b132eb1
Merge remote-tracking branch 'origin/next' into next-newcontrols
2020-01-04 09:57:09 -06:00
fickleheart
ce0c42a767
Merge branch 'newcontrols' into next-newcontrols
2020-01-04 09:56:24 -06:00
fickleheart
992ead1c85
Merge remote-tracking branch 'origin/master' into newcontrols
2020-01-04 09:35:12 -06:00
Alam Ed Arias
caa7f52f7f
Merge branch 'master' into next
2020-01-03 14:56:37 -05:00
LJ Sonic
3ae44063f1
Merge branch 'ungrab-mouse-in-menus' into 'master'
...
Let the mouse move freely when a menu is open or game is paused
See merge request STJr/SRB2!617
2020-01-02 18:48:38 -05:00
Louis-Antoine
61a681ed02
Grab mouse again when closing menu, unpausing, etc
2020-01-02 00:45:28 +01:00
James R
b342301373
Merge remote-tracking branch 'origin/master' into next
2020-01-01 15:39:05 -08:00
James R
6ea83c74c3
Merge branch 'nohw-renderswitch' into 'master'
...
NOHW V.S. Renderer Switching
See merge request STJr/SRB2!609
2020-01-01 17:52:35 -05:00
James R
b8f465408b
Merge branch 'warp-by-name' into 'master'
...
Properly fix the issue that !528 tried to; let the -warp parameter work with map name
See merge request STJr/SRB2!596
2020-01-01 17:51:21 -05:00
fickleheart
77ba835f4f
Merge branch 'next' into next-newcontrols
...
# Conflicts:
# src/g_game.c
# src/p_setup.c
2019-12-31 12:58:36 -06:00
James R
ec72c69614
Make the menu option for renderer switching transparent under NOHW
2019-12-30 21:45:19 -08:00
Jaime Passos
585db9fe2d
Merge remote-tracking branch 'origin/next' into respawndelaygametyperule
2019-12-30 18:39:31 -03:00
fickleheart
4a2492e8e1
Fix camera reset button
2019-12-30 15:34:43 -06:00
James R
67ca512120
Merge remote-tracking branch 'origin/master' into next
2019-12-30 13:16:53 -08:00
fickleheart
758bb8f3ae
Update playstyle menu handling to use analog/directionchar combo
2019-12-30 15:15:37 -06:00
fickleheart
61a8f715ac
Convert analog/directionchar cvars into 2-long arrays
2019-12-30 14:01:14 -06:00
fickleheart
be9384ddd9
Merge branch 'master' into newcontrols
...
# Conflicts:
# src/d_netcmd.c
# src/g_game.c
# src/g_game.h
# src/m_menu.c
2019-12-30 10:47:09 -06:00
James R
3883d44bb5
Warn when going to OpenGL from the menu
2019-12-29 18:37:22 -08:00
James R
08016fbdca
Split map code checking from Command_Map_f
2019-12-29 02:14:02 -08:00
Jaime Passos
142875cf3d
Fix CoopLives_OnChange.
2019-12-27 17:15:23 -03:00
Jaime Passos
ff80c4ef4d
Preparing for the inevitable gametype rule that will handle cooplives...
2019-12-27 17:08:20 -03:00
Jaime Passos
f55b4bf6ad
Merge remote-tracking branch 'origin/master' into renderswitch
2019-12-25 05:43:46 -03:00
Jaime Passos
c832d26ee9
ViewpointSwitch improvements.
2019-12-23 20:22:57 -03:00
Jaime Passos
100144d4db
Merge remote-tracking branch 'origin/master' into gametype-clownery
2019-12-23 18:21:13 -03:00
James R
74bd973616
Merge branch 'better-deadzone' into 'master'
...
Better Deadzones
See merge request STJr/SRB2!541
2019-12-20 17:33:29 -05:00
Jaime Passos
861fa5bb23
Remove this debugging command, as I don't need it anymore.
2019-12-19 00:15:19 -03:00
Jaime Passos
e47f171533
TeamSwitch hook for Lua
2019-12-18 23:40:58 -03:00
Jaime Passos
35f783ab24
GTR_FRIENDLYFIRE, renamed GTR_HIDETIMEFROZEN, fixed other mistakes
2019-12-18 20:12:52 -03:00
Jaime Passos
97db6162e8
point limit/time limit
2019-12-18 19:43:12 -03:00
Jaime Passos
dcc8cdc143
Ringslinger tweaks
2019-12-18 19:26:45 -03:00
Jaime Passos
c408cef81b
GTR_NOSPECTATORSPAWN
2019-12-18 14:47:39 -03:00
Jaime Passos
30be9e29e5
NUMGAMETYPES vs gametypecount
2019-12-18 12:30:01 -03:00
Jaime Passos
c11865e7e9
G_NewGametype
2019-12-18 12:23:42 -03:00
Jaime Passos
ecf9bdda4e
There are only so many bits
2019-12-18 12:14:18 -03:00
Jaime Passos
448494e19b
More gametype rules yay!!
2019-12-18 01:54:45 -03:00
Jaime Passos
d7cb14d38e
Gametype rules draft, mind the debug command
2019-12-18 01:25:57 -03:00
Jaime Passos
1002c47407
Merge remote-tracking branch 'origin/master' into renderswitch
2019-12-17 16:12:44 -03:00
Sryder
b4e8f71acb
Port the deadzone cvar stuff from kart.
...
Add menu items for deadzone.
2019-12-15 15:36:13 +00:00
fickleheart
17c3ef073e
Add analog deadzone option separate from digital deadzones
2019-12-14 19:41:54 -06:00
fickleheart
603d52a723
Allow setting center view to a toggle
2019-12-14 19:17:41 -06:00
