Commit graph

253 commits

Author SHA1 Message Date
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
toaster
69d43435f5 Improved "HELP" command!
Ported from Kart, original commit also by me (toaster).
2019-10-15 13:36:04 +01:00
toaster
61a242cc95 * Fix cv_pointlimit's weird behaviour in match mode by standardising the switching between "named" and "range" values in CV_AddValue.
* Optimise M_ChangeCvar.
2019-10-15 12:24:31 +01:00
toaster
b5063ab8f6 Rework min/max cvars to allow for "named" values outside their range!
Kart-port round 3, with the original commit written by me, toaster.
2019-10-15 11:23:59 +01:00
TehRealSalt
a5ea6a9799 Merge speed/encore scrambles into the normal cvars as an "auto" option 2019-10-03 01:48:16 -04:00
TehRealSalt
ca83b06d93 Fuckhuge restructuring
- m_menu.c and m_menu.h are dead. Everything has now been moved to k_menudef.c, k_menufunc.c, k_menudraw.c, and k_menu.h.
- Expanded menu_t and menuitem_t to add transitions and tooltips
- Early character select screen
- Removed almost all menu definitions, I'll be reimporting them as they are needed
2019-10-02 11:31:11 -04:00
Monster Iestyn
31c5917347 Remove references to old console ports that slipped in from the 2.1 source code a while back 2019-08-20 14:13:38 +01: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
Monster Iestyn
04a8c9a283 Merge branch 'public_next' 2019-05-16 15:58:17 +01: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
81352aece1 WIP 20190101 merge
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
2019-01-02 01:09:15 -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