SwitchKaze
9508b23d85
Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors
2020-02-29 23:41:16 -05:00
Louis-Antoine
ccd7f4297e
Obliterate resynch
...
Okay, more precisely this substitutes the old resynch with
the newly added gamestate resend code.
2020-03-01 03:22:47 +01:00
Jaime Passos
9d0e3465f9
G_CoopGametype, for all the GT_COOP cases
2020-02-29 00:57:22 -03:00
Steel Titanium
fcfaa0efde
Fix new skin colors using default chat color
2020-02-24 16:58:19 -05: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
SwitchKaze
99a1840101
Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors
2020-02-23 11:50:13 -05:00
James Hale
51137837c4
Custom skincolors
2020-02-21 21:56:39 -05:00
James R
2274129f57
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
Jaime Passos
b0ce2e088f
Merge remote-tracking branch 'origin/next' into pictureformats
2020-02-19 02:25:36 -03:00
James R
ff2ec925ee
Merge remote-tracking branch 'origin/master' into next
2020-01-30 23:54:56 -08:00
Steel Titanium
c49d01a324
Fix memory leak while chat is on screen
2020-01-30 22:11:50 -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
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
Jaime Passos
2b9b3d1561
Remove W_FlushCachedPatches
2020-01-20 17:03:38 -03:00
Alam Ed Arias
43a78e6821
Merge branch 'master' into next
2020-01-17 11:12:10 -05:00
James R
ef92934661
Merge branch 'larger-chat' into 'master'
...
Larger chat
See merge request STJr/SRB2!691
2020-01-16 20:33:09 -05:00
Alam Ed Arias
54c778b18c
Merge branch 'master' into next
2020-01-16 20:18:54 -05:00
James R
1de00bc6bb
Merge branch 'word' into 'master'
...
Word jumping
See merge request STJr/SRB2!653
2020-01-16 20:05:12 -05:00
Louis-Antoine
fc01862eeb
bruh
2020-01-15 15:57:38 +01:00
Louis-Antoine
6d703add73
Cleanup chat code a little
2020-01-15 15:48:03 +01: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
James R
c3192040a1
Give chat word jumping
2020-01-08 12:58:34 -08: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
Louis-Antoine
61a681ed02
Grab mouse again when closing menu, unpausing, etc
2020-01-02 00:45:28 +01: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
Jaime Passos
585db9fe2d
Merge remote-tracking branch 'origin/next' into respawndelaygametyperule
2019-12-30 18:39:31 -03: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
Jaime Passos
ff80c4ef4d
Preparing for the inevitable gametype rule that will handle cooplives...
2019-12-27 17:08:20 -03:00
Jaime Passos
24f546d992
Fix timelimit/pointlimit checks in HU_DrawRankings, organise rules in gametypedefaultrules a bit
2019-12-18 22:23:30 -03:00
Jaime Passos
156d5fd37f
Custom gametype rankings
2019-12-18 22:02:37 -03:00
Jaime Passos
dcc8cdc143
Ringslinger tweaks
2019-12-18 19:26:45 -03:00
Jaime Passos
b6b98cd464
Rankings tweaks
2019-12-18 12:36:02 -03:00
Jaime Passos
30be9e29e5
NUMGAMETYPES vs gametypecount
2019-12-18 12:30:01 -03:00
Jaime Passos
789e881abc
GTR_TEAMFLAGS
2019-12-18 11:43:50 -03:00
fickleheart
4cc0bb4746
Add boss target assist and finally organize camera options
2019-12-12 00:48:15 -06:00
fickleheart
0ab83319a5
Move Z-targeting behavior to Center View
2019-12-11 21:09:23 -06:00
Jaime Passos
6976b9bf01
Merge remote-tracking branch 'origin/master' into renderswitch
2019-12-10 23:01:10 -03:00
fickleheart
d88bc63ee8
Draw crosshair in Simple mode while holding cam reset
...
I think this gives extra indication that abilities face toward
the camera now.
2019-12-09 22:12:19 -06:00
Steel Titanium
a5cdb0a4b3
Update copyright date on source files
2019-12-06 13:49:42 -05:00
MascaraSnake
abdfc2d237
Merge branch 'exit-move-lj' into 'master'
...
Post-exit movement
See merge request STJr/SRB2Internal!486
2019-11-18 15:10:15 -05:00
James R
a8a6add1fc
Shift ping display in scores HUD up, so it aligns with the bottom of player name
2019-11-17 18:53:17 -08:00
James R
51a2b76970
Snapping for showping, so it doesn't jump way up on non-green
2019-11-17 18:52:05 -08:00
Steel Titanium
b1f39e836d
Better ping implementation.
2019-11-17 20:22:47 -05:00
Louis-Antoine
1ef50d8813
Show the exit icon for finished players
2019-11-17 23:44:48 +01:00
