Commit graph

246 commits

Author SHA1 Message Date
James R
df19ededb8 Use ordered ids instead of hashes for cvar netid
Originally 6acd99c0a465ab1594edc12502f71a5e0a3af938
2020-06-19 16:36:36 -07:00
toaster
555d7f960b Merge conflict resolution for command.c 2020-05-31 23:42:59 +01:00
Sally Coolatta
63917ffccc The start of the scary 2.2 merge
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
2020-05-29 13:43:38 -04:00
Sally Coolatta
0dd19f4f50 Merge branch 'master' into new-menus 2020-05-16 04:37:44 -04:00
Sally Coolatta
8be2d12b99 Merge remote-tracking branch 'public/master' 2020-05-16 00:08:53 -04:00
Monster Iestyn
49ff331ac0 Detect infinite alias self-recursion mixed with other commands, such as in the case of alias a "echo test; a"; a.
(Unfortunately, this does not work if "wait" is used instead of "echo", but oh well)

(cherry picked from commit e501d9c6af)
2020-05-13 16:03:26 -07:00
Sally Coolatta
15d18640de Merge remote-tracking branch 'public/master' into merge-12 2020-05-12 03:16:14 -04:00
Sally Coolatta
b4f8d708a4 Merge branch 'master' into new-menus 2020-05-09 17:04:10 -04:00
James R
67c355e571 Use COM_ImmedExecute to load the config, so the buffer size doesn't matter 2020-05-04 12:19:53 -07:00
James R
6613b19220 Merge remote-tracking branch 'lat/remove-passwords' into awful-mix-fucked 2020-04-26 01:16:27 -07:00
James R
28b1e8de1c Merge remote-tracking branch 'origin/master' into next 2020-04-18 17:20:33 -07:00
Wolfy
5e4ec61d82 Merge remote-tracking branch 'remotes/bird/isolatedbatching' into awful-mix
# Conflicts:
#	src/hardware/hw_cache.c
#	src/hardware/hw_draw.c
#	src/hardware/hw_glob.h
#	src/hardware/hw_main.c
#	src/r_bsp.h
#	src/r_data.c
2020-04-11 23:47:25 -05:00
Hannu Hanhi
bba15645fb Don't destroy my config file 2020-04-12 02:18:12 +03:00
James R
ccc746fbf4 Change netvars in replays 2020-04-09 17:21:30 -07:00
Louis-Antoine
46df2b9551 Use HAVE_BLUA as fuel for my fireplace 2020-03-19 18:36:14 +01:00
Latapostrophe
e801057559 Expose CV_FindVar to Lua 2020-03-10 18:12:20 +01:00
fickleheart
614bbafc1b Increase COM_BUF_SIZE
The config file is starting to get close to the old max,
so this should be enough headroom for a while...
2020-02-24 11:45:22 -06:00
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
James R
d1aa45212d Merge branch 'trim-floats' into 'master'
Trim the trailing zeros off floats for cvars

See merge request STJr/SRB2!716
2020-02-17 00:04:15 -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
James R
99ad30796c Trim the trailing zeros off floats for cvars 2020-01-20 23:14:26 -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
fickleheart
067b132eb1 Merge remote-tracking branch 'origin/next' into next-newcontrols 2020-01-04 09:57:09 -06:00
fickleheart
992ead1c85 Merge remote-tracking branch 'origin/master' into newcontrols 2020-01-04 09:35:12 -06:00
James R
7e0dd5bf02 Merge branch 'findvar' into 'next'
CV_FindVar for Lua

See merge request STJr/SRB2!583
2020-01-02 20:54:16 -05:00
James R
8720bbe044 Hahahahahahahahahahahahaha 2020-01-01 15:52:23 -08:00
James R
7d6d8b3b6e Fix command not running if it was split by COM_BufAddText
(Looks at d57083264e93f1020c2730e072c7a7b5417e08b3...)
2019-12-30 18:47:21 -08:00
James R
46c0d62a06 Fix unclosed quotes leaving the escape character in 2019-12-30 18:44:13 -08:00
James R
c8e08ec617 Expose CV_FindVar
(cherry picked from commit 0e9d69d6a3759686ca8bb567817be650291ea0e1)
2019-12-26 18:30:34 -08:00
James R
d57083264e One more optimization 2019-12-26 18:23:01 -08:00
James R
bbed1a16ba e 2019-12-26 18:20:48 -08:00
James R
4100e43a9d CV_NOLUA for when a cvar should not be changed via Lua 2019-12-26 18:15:19 -08:00
James R
43dab49e74 A system to encode flags in the command buffer 2019-12-26 18:12:10 -08:00
fickleheart
b672796e6e Fix float cvars saving wrong when set to max 2019-12-13 23:05:36 -06:00
Alam Ed Arias
247ef908f0 Let fix that GCC warning 2019-12-06 18:12:50 -05:00
James R
c3c3fac1a8 Use strncpy 2019-12-06 15:09:07 -08:00
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05:00
fickleheart
7025a23f25 Merge remote-tracking branch '[remote name redacted]/jimita-shaders'
# Conflicts:
#	src/hardware/hw_main.c
2019-12-01 11:58:24 -06:00
James R
85b6b307e8 Optimizations from LJ and generic functions 2019-11-13 14:26:28 -08:00
TehRealSalt
be74c5217e Merge branch 'master' into new-menus 2019-10-27 15:50:40 -04:00
MascaraSnake
2004577314 Merge branch 'james-kart' into 'master'
My changes to Kart

See merge request STJr/SRB2Internal!406
2019-10-25 15:36:40 -04:00
James R
84aea5ef5b Support adding to CV_FLOAT cvars with the Add command 2019-10-22 20:04:02 -07:00
James R
be4ac1eef4 Add a command to increment cvars 2019-10-22 20:03:45 -07:00
James
d306df81c8 Merge branch 'master' into new-menus 2019-10-19 19:56:34 -04:00
TehRealSalt
c963a49542 Try fixing Auto causing desyncs
- Move K_SetPowerLevelScrambles to G_DoCompleted
- Fix wrong gamespeed being displayed in strings
- Add defines for kartspeed values
- Disable Easy scrambles again
- Corrupt gamedata if pwrlv is in invalid range (gets corrected in-game, and doesn't really matter to anyone who knows what you're doing, but it'll stop at least the most basic script kiddie)

Replay menu will still display wrong speed name, but it's fine in the replay itself.
2019-10-17 23:43:06 -04:00
TehRealSalt
64a3d133b4 Cleanup & bug-fixin 2019-10-15 20:56:28 -04:00
toaster
effb506120 Make use of MINVAL and MAXVAL consistent in COM_Help_f. 2019-10-15 13:46:45 +01:00