Jaime Passos
d5f6e5fcc6
Race is Competition without the lives
2020-02-28 23:47:38 -03:00
James R
f9b5f71171
Merge branch 'gentlemen' into parties
2020-02-23 23:22:37 -08:00
James R
7fe61a99df
More plurals
2020-02-23 23:21:20 -08:00
James R
dfe6d62d76
bruh
2020-02-23 23:21:20 -08:00
James R
fc1e4b5cc5
Just say "joined" so to not worry about plurals
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
e235267f1d
Improve feedback on party invitations
2020-02-23 23:20:20 -08:00
James R
110871c3b6
Void the party invitation once its accepted
2020-02-23 23:20:20 -08:00
James R
02757eac82
Fix and fully implement leaving parties
2020-02-23 23:20:20 -08:00
James R
46ac563eaf
Implement big bad parties (splitscreen with network players)
...
Use the 'invite' command to invite another player to your party.
If that player accepts, via the 'acceptinvite' command, they and any
splitscreen players on their machine will be added after the players
in your party. They may also use the 'rejectinvite' command.
Use the 'leaveparty' command to leave a party. You and any splitscreen players
on your machine will be removed from the party. Players after you will be
shifted to take your place on the splitscreen.
2020-02-23 23:20: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
James R
56f6b058d0
Make host lag optional with "lagless", lag by default (lagless off)
2020-02-23 23:07:57 -08: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
1b9a6fed3e
Same here
2020-02-23 16:46:45 -03:00
Jaime Passos
990df8e8c0
Consider Co-Op here as any campaign gametype
2020-02-23 16:45:01 -03:00
Jaime Passos
1d5f9ed292
Always allow skin switching in friendly gametypes
2020-02-23 16:40:52 -03:00
SwitchKaze
99a1840101
Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors
2020-02-23 11:50:13 -05:00
Jaime Passos
745a6bb0f0
Fix incorrect newdisplayplayer in forced ViewpointSwitch
2020-02-23 12:14:52 -03:00
James Hale
51137837c4
Custom skincolors
2020-02-21 21:56:39 -05:00
Steel Titanium
fc042e90f0
Merge branch 'master' into next
2020-02-21 21:01:29 -05:00
Louis-Antoine
c785fc2132
Cleanup code a little
2020-02-22 02:21:27 +01:00
James R
2274129f57
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
Louis-Antoine
a09d46a092
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into lua-io
2020-02-19 22:40:54 +01:00
Tatsuru
7f190f35f2
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into Tatsuru/SRB2-dye
...
# Conflicts:
# src/d_player.h
# src/dehacked.c
2020-02-19 17:46:18 -03:00
Tatsuru
1463d8ba20
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into dye
2020-02-19 17:32:43 -03:00
James R
ba9f866acf
Merge branch 'exitmove-tweaks' into 'next'
...
Exitmove tweaks
See merge request STJr/SRB2!709
2020-02-18 21:58:18 -05:00
James R
256c9a20db
Merge branch 'local-color-table' into 'master'
...
Local Color Table for GIF movie mode
See merge request STJr/SRB2!742
2020-02-16 23:58:11 -05:00
James R
4415fb4c75
Merge remote-tracking branch 'origin/master' into next
2020-02-04 14:31:21 -08:00
James R
937f18dee7
Remove Player 0
2020-02-01 18:22:03 -08:00
James R
9192e1eade
Clean player name before joining!!!
2020-02-01 18:20:35 -08:00
James R
a65e8ab500
Add missing conditions to CleanupPlayerName
2020-02-01 18:11:41 -08:00
Latapostrophe
9d848db7c1
How can you look at yourself in the mirror?
2020-01-29 22:33:00 +01:00
Jaime Passos
5f7cf83da8
Local Color Table for GIF movie mode
2020-01-29 13:47:55 -03:00
Louis-Antoine
6d42930c8e
Update Lua I/O support to 2.2
2020-01-22 23:08:57 +01: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
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
