Sally Coolatta
71375e412b
Merge command.c
2020-08-10 11:42:12 -04:00
Sally Coolatta
e296e1309a
YAY, round 2
2020-08-09 21:02:56 -04:00
James R
f8b659e4bd
Merge branch 'various-color-fixes' into 'next'
...
Various color fixes
See merge request STJr/SRB2!1060
2020-07-13 18:24:55 -04:00
James R
e09a430804
Merge remote-tracking branch 'origin/next' into remove-glide-2
2020-07-12 16:05:15 -07:00
kaysrishaq
be8f10d039
various color fixes
2020-07-12 07:39:52 -04:00
James R
d06eb9dc5f
Merge branch 'netid-take-2' into 'next'
...
Use ordered id for netvars instead of shitty hash
See merge request STJr/SRB2!1010
2020-07-11 02:00:06 -04:00
Louis-Antoine
b063f57be2
Fix autoexec file trying to set netvars when joining from command-line
2020-07-07 16:19:25 +02:00
Jaime Passos
615c7121ed
gr_ -> gl_
2020-07-06 01:15:08 -03:00
James R
3554cc8b1b
Actually save the cvar name in demos
2020-07-04 12:51:07 -07:00
James R
785ff5b8eb
I meant consvar_number_of_netids to be exclusive :V
2020-06-20 00:53:51 -07:00
James R
f7503adbde
Actually print a warning if the old demo id collides
2020-06-19 19:59:14 -07:00
James R
b89be9f179
Cvar compatibility with older demos
2020-06-19 18:04:20 -07:00
James R
31cf034d63
Save cvar names in demos; refactor cvar loading
2020-06-19 17:58:42 -07:00
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
