Zachary McAlpin
f97187f59b
Revert "Call LUAh_GameQuit in Command_ExitGame_f"
...
This reverts commit 2b16971137
2020-03-12 22:31:48 -05:00
Zachary McAlpin
7ec241c59e
Revert "Don't execute LUAh_GameQuit in Command_ExitGame_f if you are in a multiplayer game"
...
This reverts commit bef49f5660
2020-03-12 22:31:39 -05:00
Zachary McAlpin
bef49f5660
Don't execute LUAh_GameQuit in Command_ExitGame_f if you are in a multiplayer game
2020-03-12 20:51:16 -05:00
Zachary McAlpin
2b16971137
Call LUAh_GameQuit in Command_ExitGame_f
2020-03-12 20:15:21 -05:00
LJ Sonic
2cace6e147
Merge branch 'lua-io' into 'next'
...
Support for Lua's I/O library
See merge request STJr/SRB2!727
2020-03-01 11:12:45 -05:00
Steel Titanium
76f26cda24
Merge branch 'master' into next
2020-02-21 21:01:29 -05:00
James R
7060083db5
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
Louis-Antoine
12959ff4a9
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into lua-io
2020-02-19 22:40:54 +01:00
James R
92f65fd822
Merge branch 'exitmove-tweaks' into 'next'
...
Exitmove tweaks
See merge request STJr/SRB2!709
2020-02-18 21:58:18 -05:00
James R
132e8f82d5
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
7805828c4a
Merge remote-tracking branch 'origin/master' into next
2020-02-04 14:31:21 -08:00
James R
d5ced42f06
Remove Player 0
2020-02-01 18:22:03 -08:00
James R
bf3b7fc5b0
Clean player name before joining!!!
2020-02-01 18:20:35 -08:00
James R
ab8eed6efb
Add missing conditions to CleanupPlayerName
2020-02-01 18:11:41 -08:00
Jaime Passos
5a330803ec
Local Color Table for GIF movie mode
2020-01-29 13:47:55 -03:00
Louis-Antoine
e8760fe5dd
Update Lua I/O support to 2.2
2020-01-22 23:08:57 +01:00
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
Tatsuru
697dbd58e7
Turn cv_exitmove on by default
2020-01-19 21:56:53 -03:00
Tatsuru
9e4c519cad
In-map visual indicator
2020-01-19 19:02:03 -03: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
