lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
9269 commits 1 branch 29 tags 122 MiB
Commit graph

416 commits

Author SHA1 Message Date
Louis-Antoine 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
Louis-Antoine 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
Alam Ed Arias b09341383f Merge branch 'master' into next 2020-01-17 11:12:10 -05:00
James R 708ab6ff90 Update buffer for SendNameAndColor 2020-01-14 21:40:58 -08:00
James R 2b95ea0135 Merge remote-tracking branch 'origin/master' into next 2020-01-12 14:17:52 -08:00
LJ Sonic 6eba68bc3b 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 e9108de365 Replace all instances of XD_KICK with a SendKick function 2020-01-12 19:43:04 +01:00
fickleheart f8a3e3b898 Merge remote-tracking branch 'origin/next' into next-newcontrols 2020-01-04 09:57:09 -06:00
fickleheart f0e6a56b6b Merge branch 'newcontrols' into next-newcontrols 2020-01-04 09:56:24 -06:00
fickleheart 794d74c4d7 Merge remote-tracking branch 'origin/master' into newcontrols 2020-01-04 09:35:12 -06:00
Alam Ed Arias a26c5f5428 Merge branch 'master' into next 2020-01-03 14:56:37 -05:00
LJ Sonic c6aec51d99 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 5bde4df439 Grab mouse again when closing menu, unpausing, etc 2020-01-02 00:45:28 +01:00
James R 0c40a466d8 Merge remote-tracking branch 'origin/master' into next 2020-01-01 15:39:05 -08:00
James R e9843590da 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 01be810aee 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 b22de48c03 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 7af2533d23 Make the menu option for renderer switching transparent under NOHW 2019-12-30 21:45:19 -08:00
Jaime Passos 181a366d4a Merge remote-tracking branch 'origin/next' into respawndelaygametyperule 2019-12-30 18:39:31 -03:00
fickleheart 2c45ecbaa5 Fix camera reset button 2019-12-30 15:34:43 -06:00
James R fc8c0f8a9a Merge remote-tracking branch 'origin/master' into next 2019-12-30 13:16:53 -08:00
fickleheart a51f2500e0 Update playstyle menu handling to use analog/directionchar combo 2019-12-30 15:15:37 -06:00
fickleheart e0f35d207f Convert analog/directionchar cvars into 2-long arrays 2019-12-30 14:01:14 -06:00
fickleheart a9b80bf1f0 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 569453ee93 Warn when going to OpenGL from the menu 2019-12-29 18:37:22 -08:00
James R 19aafbfd0b Split map code checking from Command_Map_f 2019-12-29 02:14:02 -08:00
Jaime Passos 4b2c88fab8 Fix CoopLives_OnChange. 2019-12-27 17:15:23 -03:00
Jaime Passos 1f96f70173 Preparing for the inevitable gametype rule that will handle cooplives... 2019-12-27 17:08:20 -03:00
Jaime Passos 03a3b02301 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-25 05:43:46 -03:00
Jaime Passos a657392d39 ViewpointSwitch improvements. 2019-12-23 20:22:57 -03:00
Jaime Passos 61b72203a8 Merge remote-tracking branch 'origin/master' into gametype-clownery 2019-12-23 18:21:13 -03:00
James R 2ed5617c5f Merge branch 'better-deadzone' into 'master' 
Better Deadzones

See merge request STJr/SRB2!541
 2019-12-20 17:33:29 -05:00
Jaime Passos e4b4b60cb6 Remove this debugging command, as I don't need it anymore. 2019-12-19 00:15:19 -03:00
Jaime Passos be5fd1a0db TeamSwitch hook for Lua 2019-12-18 23:40:58 -03:00
Jaime Passos d0e18444fb GTR_FRIENDLYFIRE, renamed GTR_HIDETIMEFROZEN, fixed other mistakes 2019-12-18 20:12:52 -03:00
Jaime Passos 04ee98a1a1 point limit/time limit 2019-12-18 19:43:12 -03:00
Jaime Passos 396106829a Ringslinger tweaks 2019-12-18 19:26:45 -03:00
Jaime Passos 0577cec01b GTR_NOSPECTATORSPAWN 2019-12-18 14:47:39 -03:00
Jaime Passos 7807424633 NUMGAMETYPES vs gametypecount 2019-12-18 12:30:01 -03:00
Jaime Passos 15862ed02c G_NewGametype 2019-12-18 12:23:42 -03:00
Jaime Passos 6660d63028 There are only so many bits 2019-12-18 12:14:18 -03:00
Jaime Passos ea5e0d28ed More gametype rules yay!! 2019-12-18 01:54:45 -03:00
Jaime Passos 7bfdc2caa0 Gametype rules draft, mind the debug command 2019-12-18 01:25:57 -03:00
Jaime Passos cc54163210 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-17 16:12:44 -03:00
Sryder 76d59330f7 Port the deadzone cvar stuff from kart. 
Add menu items for deadzone.
 2019-12-15 15:36:13 +00:00
fickleheart a885380e8a Add analog deadzone option separate from digital deadzones 2019-12-14 19:41:54 -06:00
fickleheart 0702e366b6 Allow setting center view to a toggle 2019-12-14 19:17:41 -06:00
fickleheart a188cd5db8 Add boss target assist and finally organize camera options 2019-12-12 00:48:15 -06:00
James R 6464df9876 Maybe I'm mistaken but this probably isn't needed 2019-12-11 16:14:06 -08:00
fickleheart 69b623e086 Add option to always turn with input while locked 
Uhhh also camera options scrolls now.
 2019-12-10 22:01:17 -06:00