Jaime Passos
d831163487
Consider hide-and-seek as GTR_HIDEFROZEN
2020-02-28 23:52:33 -03:00
James R
0c814ce42d
Sync look back
...
Also fixes look back applying to the first
player in parties instead of locally.
2020-02-23 23:21:20 -08:00
James R
7961ac9d95
Fix moving while viewing another player not resetting the viewpoint
2020-02-23 23:21:20 -08:00
James R
4f40edaf01
Maybe localdisplayplayers is a bad idea
2020-02-23 23:21:20 -08:00
James R
f164320c88
Make the order of displayplayers irrelevant and split splitscreen into splitscreen and r_splitscreen
2020-02-23 23:20:20 -08:00
James R
352d576979
Don't turn off lagless at map start; draw LAGLESS in intermission
2020-02-23 23:07:57 -08:00
Jaime Passos
7a34372885
Let spectators decide where they spawn
...
Also fixes some issues with tag gametypes
2020-02-23 19:23:00 -03:00
Jaime Passos
48a9ea8d0e
Turn players IT if they join the game after the hide time in tag gametypes
...
Except in gametypes with hide time stasis, because they can't change team.
2020-02-23 17:02:50 -03:00
Jaime Passos
8efba0e367
Allow countdown time-up in any campaign gametype
2020-02-23 16:50:36 -03:00
Jaime Passos
4d94689af7
Scan for emeralds in gametypes with Emerald Hunt
2020-02-23 16:41:39 -03:00
Jaime Passos
220cf7bd89
Don't reset player between maps in campaign gametypes
2020-02-23 16:40:16 -03:00
Jaime Passos
745a6bb0f0
Fix incorrect newdisplayplayer in forced ViewpointSwitch
2020-02-23 12:14:52 -03:00
Steel Titanium
fc042e90f0
Merge branch 'master' into next
2020-02-21 21:01:29 -05:00
James R
2274129f57
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
James R
b329536bd1
Merge branch 'titlecard-options' into 'next'
...
Allow more options for when the titlecard shows up
See merge request STJr/SRB2!765
2020-02-18 21:52:03 -05:00
Monster Iestyn
41bdc91bf0
Merge branch 'master' into next
2020-02-18 17:38:05 +00:00
James R
c4003109b9
Merge branch 'tolfix' into 'master'
...
Don't freeslot TOL_ twice
See merge request STJr/SRB2!779
2020-02-16 23:52:45 -05:00
Jaime Passos
2a0495f11b
Merge remote-tracking branch 'origin/next' into fix-overtime
2020-02-17 00:48:42 -03:00
fickleheart
427e99f222
Merge remote-tracking branch 'upstream/master' into titlecard-options
2020-02-16 21:32:27 -06:00
Jaime Passos
23f148f32d
Fix overtime not working
2020-02-15 13:07:53 -03:00
Jaime Passos
83112c8248
Add MAXTOL
2020-02-12 13:41:30 -03:00
James R
0723383587
Remove extra tokens if we got all 7 emeroods
2020-02-11 19:36:09 -08:00
fickleheart
0de2068b88
More fixes for titlecard option stuff
2020-02-09 17:53:50 -06:00
Jaime Passos
c05b613724
Fix broken GT_ constants with custom gametypes
2020-02-08 21:40:30 -03:00
fickleheart
33c103c319
Allow more options for when the titlecard shows up
2020-02-08 11:13:40 -06:00
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
