Commit graph

1425 commits

Author SHA1 Message Date
Jaime Passos
447ee1a04c Remove redundancy 2020-01-26 23:46:07 -03:00
LJ Sonic
0beae26e9d Merge branch 'keep-body' into 'next'
Let clients rejoin the server without losing their status

See merge request STJr/SRB2!722
2020-01-24 18:50:03 -05: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
7d615ed94b Refactor player spawning code a little 2020-01-22 03:19:15 +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
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
Alam Ed Arias
43a78e6821 Merge branch 'master' into next 2020-01-17 11:12:10 -05:00
Louis-Antoine
7459a6b4a8 Increase maximum and default chat width 2020-01-15 15:36:11 +01:00
James R
4f0acda87c Call it KEYWORDS 2020-01-08 14:41:38 -08:00
James R
d3da473d4c Revert "Oh right, the keywords..."
This reverts commit 7431794b5c.
2020-01-08 14:26:47 -08:00
fickleheart
e20365ca81 Mixed code and declaration stuff 2020-01-08 00:22:17 -06:00
fickleheart
7008c10f23 oh god I forget why this is here but let's not remove it now 2020-01-08 00:21:03 -06: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
f05d0e91ad Fix camera stuff in splitscreen 2020-01-04 09:54:56 -06:00
fickleheart
992ead1c85 Merge remote-tracking branch 'origin/master' into newcontrols 2020-01-04 09:35:12 -06:00
fickleheart
f2b6f3fd6e Make holding both turn keys freeze camera direction (broke in merge) 2020-01-03 23:26:31 -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
75514def83 Merge branch 'respawndelaygametyperule' into 'next'
Gametype ruleset changes

See merge request STJr/SRB2!585
2020-01-01 17:49:53 -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
lachwright
aaa1875040 Remove flight indicator when AI Tails is taken over by second player 2019-12-31 16:48:29 +08:00
James R
39b7cb4fef Merge branch 'oops' into 'next'
Fix unknown gametype for map command crashing the game

See merge request STJr/SRB2!606
2019-12-31 01:34:39 -05:00
James R
be66b67f63 Merge branch 'emeraldhunt-fix' into 'next'
Fix emerald hunt not working properly

See merge request STJr/SRB2!593
2019-12-31 01:34:17 -05:00
fickleheart
0ffb1e11f9 Fix tailsbot behavior that broke with Simple mode 2019-12-30 23:58:58 -06:00
James R
2e8f83b79c Use gametypecount in G_GetGametypeByName 2019-12-30 17:57:38 -08:00
fickleheart
4a2492e8e1 Fix camera reset button 2019-12-30 15:34:43 -06:00
fickleheart
758bb8f3ae Update playstyle menu handling to use analog/directionchar combo 2019-12-30 15:15:37 -06:00
fickleheart
e0d09a457e Convert simple movement to directionchar+analog
Analog + no directionchar is old analog (now known as
CS_LMAOGALOG because lmao if you still use it).
2019-12-30 15:05:24 -06:00
fickleheart
61a8f715ac Convert analog/directionchar cvars into 2-long arrays 2019-12-30 14:01:14 -06:00
fickleheart
0f62ada954 Disable lock-on in Ringslinger 2019-12-30 12:13:41 -06:00
fickleheart
774412bbfd Somehow miss committing the ACTUAL stickyhold part 2019-12-30 11:36:59 -06:00
fickleheart
aadc91e4e8 Change defaults to match my personal settings 2019-12-30 11:36:40 -06:00
fickleheart
0577c151ce Fix tailsbot flying weird with P1=standard P2=simple controls 2019-12-30 11:07:29 -06:00
fickleheart
205b1cc4cd Fix compilation errors 2019-12-30 11:01:56 -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
Jaime Passos
12068930b2 Merge remote-tracking branch 'origin/next' into respawndelaygametyperule 2019-12-30 12:09:45 -03:00
MascaraSnake
6b53b883c5 Merge branch 'mapload-refactor' into 'next'
Refactor map loading functions

See merge request STJr/SRB2!594
2019-12-29 10:04:27 -05:00
MascaraSnake
8d561a20c1 Merge branch 'kill-zshift' into 'next'
Eliminate all unnecessary uses of ZSHIFT

See merge request STJr/SRB2!580
2019-12-29 08:35:52 -05:00
James R
909a9dccc7 Don't let us warp to a map that doesn't exist (really!)
Okay so 66524a1e3f, I WAS mistaken! Except that's
not how you check for a map's existence, at least not how the old map command
did it.
2019-12-29 02:44:27 -08:00
James R
69535cf202 I'm still an idiot 2019-12-29 02:16:37 -08:00
James R
0004f47f94 Who cares? 2019-12-29 02:15:48 -08:00
James R
08016fbdca Split map code checking from Command_Map_f 2019-12-29 02:14:02 -08:00
Steel Titanium
0ecbd0baec Fix emerald hunt not working properly 2019-12-28 21:57:29 -05:00
Jaime Passos
bd28daea02 Merge remote-tracking branch 'origin/next' into respawndelaygametyperule 2019-12-28 21:39:38 -03:00
Jaime Passos
37b1953a14 Disallow few more characters. 2019-12-28 21:05:42 -03:00
Jaime Passos
4dafc59133 Remove characters that will not be allowed in the constant string. 2019-12-28 20:54:22 -03:00