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
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
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
Latapostrophe
e801057559
Expose CV_FindVar to Lua
2020-03-10 18:12:20 +01: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
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
a5ea6a9799
Merge speed/encore scrambles into the normal cvars as an "auto" option
2019-10-03 01:48:16 -04:00
Latapostrophe
ec1272dd14
remove join passwords
2019-08-04 11:26:26 +02:00
James R
460105cb8a
Support adding to CV_FLOAT cvars with the Add command
2019-07-04 17:48:17 -07:00
Latapostrophe
a35cea9243
chaos conflict
2019-06-11 17:02:47 +02:00
wolfy852
9ac41cca73
Merge remote-tracking branch 'remotes/pub/next' into v1
...
# Conflicts:
# src/d_netcmd.c
# src/r_main.c
# src/v_video.c
2019-05-12 03:40:02 -05:00
Monster Iestyn
2b636ae614
Merge branch 'alias_recursion_hotfix_2' into 'master'
...
Alias recursion hotfix 2
See merge request STJr/SRB2!482
2019-05-08 11:25:15 -04:00
wolfy852
2222738e1c
Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next
...
# Conflicts:
# src/d_netcmd.c
# src/doomdef.h
# src/doomstat.h
# src/f_finale.c
# src/g_game.c
# src/hu_stuff.c
# src/m_menu.c
# src/p_spec.c
# src/p_user.c
# src/r_main.c
# src/r_things.c
# src/s_sound.c
# src/v_video.c
# src/y_inter.c
2019-05-06 22:40:12 -05:00
TehRealSalt
f48a08cd53
Merge v1
2019-05-06 21:23:29 -04:00
wolfy852
4eb2a7d2eb
Merge remote-tracking branch 'remotes/pub/master' into next
2019-05-06 14:17:02 -05:00
TehRealSalt
f1f664e9b1
Merge v1
2019-05-02 01:36:19 -04:00
James R
c2a14da4b5
Add a command to increment cvars
2019-04-18 23:42:28 -07:00
James R
b28221bdb2
Don't count down wait timer when executing a command
2019-04-14 15:17:47 -07:00
Monster Iestyn
e501d9c6af
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)
2019-04-14 16:39:14 +01:00
fickleheart
0318bf7116
Preserve quote and etc in aliases
2019-04-13 10:25:56 -05:00
fickleheart
9d408b474b
Use strchr?
2019-04-13 10:16:54 -05:00
fickleheart
c7be2769a2
Allow argument substitution in aliases
2019-04-12 00:48:37 -05:00
fickleheart
be458c1d05
Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays
...
# Conflicts:
# src/doomdef.h
# src/g_game.c
# src/p_user.c
2019-03-19 22:17:25 -05:00
fickleheart
bc647657f4
Fix password auto-hiding if you type into it
2019-03-09 17:06:44 -06:00
Alam Arias
55d07235a4
do not overshadow demorecording
2019-03-04 19:16:46 -05:00
fickleheart
c944a524d1
Fix invalid numlaps value being written when set to map default
2019-01-27 17:58:13 -06:00
fickleheart
d9f1345701
[HACK] Save correct lap count on netreplays
2019-01-27 15:45:42 -06:00
SeventhSentinel
3fe7856ba3
Keep execversion stuff on, just dummied out
...
Had issues with skin values not changing from the menu, this seemed to fix it
2019-01-06 01:41:42 -05:00
SeventhSentinel
046d66d803
Fix errors from merge
2019-01-06 01:00:30 -05:00
SeventhSentinel
1d58c6b8c2
merge srb2 next
2019-01-05 15:59:23 -05:00
mazmazz
4fad53fe94
Merge remote-tracking branch 'public-gl/2122-version' into 2122-version
2018-12-22 23:42:25 -05:00
mazmazz
4e055bd383
Properly restrict EXECVERSION from cvar updates
2018-12-20 17:56:51 -05:00
mazmazz
436c49e38b
Adjust execversion retrieval in CV_FilterVarByVersion
2018-12-20 02:18:59 -05:00
mazmazz
80d027ee47
Decouple execversion from MODVERSION; add scheme for MINORMODVERSION
2018-12-17 13:38:23 -05:00
Alam Ed Arias
261e1e623c
Clear float equal warnings
2018-12-14 20:34:06 -05:00
mazmazz
56e54a38cc
EXEC: Search for CFG by file path
2018-12-13 13:11:25 -05:00
mazmazz
439fff4402
Register execversion and remove CV_SAVE because we write manually
2018-12-06 12:28:30 -05:00
mazmazz
49d899ffea
a stray if block
2018-12-06 12:03:53 -05:00
mazmazz
86b3221986
alwaysfreelook -> alwaysmlook string
2018-12-06 12:02:45 -05:00
mazmazz
fd6f5a9fbd
Add alwaysfreelook2 and mousemove2 to config versioning
...
* Change alwaysfreelook2 to be consistent with alwaysfreelook (the only one that wasn't the same)
2018-12-06 11:59:34 -05:00
mazmazz
e8584f2535
Implement EXECVERSION consvar to invalidate previous versions' default config values
2018-12-06 06:28:34 -05:00
Monster Iestyn
94ad0b880f
Merge branch 'next' into 21-version
...
# Conflicts:
# src/d_netcmd.c
2018-12-02 15:45:07 +00:00
TehRealSalt
4507ee18fd
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
Wolfy
cabe9871e3
Multiple admins
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
2018-11-29 06:46:59 -06:00
Monster Iestyn
d824e05a6f
Merge branch 'master' into next
2018-11-25 20:39:17 +00:00