Commit graph

71 commits

Author SHA1 Message Date
Sally Coolatta
e2b2b7785c Cheater warning 2022-09-27 15:22:59 -04:00
Sally Coolatta
a60d48202f Merge branch 'master' into cheats-streamline 2022-09-24 14:32:15 -04:00
Sally Coolatta
117d791424 Merge branch 'master' into cheats-streamline 2022-09-23 14:38:54 -04:00
James R
4fb1eef8f1 command.c: refactor Setvalue, create CV_CompleteValue 2022-09-20 08:29:21 -07:00
toaster
acd777a77a Significant work into the play-starting experience
- Take the weird extra mini settings menu out of the Online Host Game sequence
- Make sure to actively use the server variables in Match Race creation
    - Hides the Auto options for Encore and Kartspeed on the Match Race menu specifically...
    - BUT if you leave it at the default it'll secretly set them to Auto!!!
2022-09-04 20:14:30 +01:00
toaster
6544e95c01 Rework gamespeed cvar handling a little bit.
- Make the menu-only dummykartspeed and dummygpdifficulty cvars also affected by the unlock system.
- Master mode is currently behind SECRET_HARDSPEED, this can be changed later when we're seriously thinking about unlock progression.
- Complete forwardport of changes to cv_kartspeed from 1.4+, since I missed a spot previously.
2022-09-04 14:56:07 +01:00
Sally Coolatta
36b8ab1eac Streamline cheats
"cheats" is a proper cvar now. Enabling it allows for cheats to be used any time, even in multiplayer, and disables gamedata saving. Turning it off undoes as many cheat commands as reasonably possible. Based a little bit off of some vanilla work I also did.

Many cheat commands are still SP-only, but can reasonably be allowed in netgames now if a net command is created for them.
2022-06-08 12:46:56 -04:00
toaster
b4af07ffed Merge branch 'master' into new-menus
# Conflicts:
#	src/d_main.c
#	src/dehacked.c
#	src/m_menu.c
#	src/v_video.c
#	src/y_inter.c
2021-10-18 01:18:37 +01:00
Sally Coolatta
9d7ec0ab8f Merge SRB2 next
Probably doesn't compile yet, but I got rid of all of the conflicts for anyone who wants to take a stab at it.
2021-02-27 05:18:36 -05:00
Sally Coolatta
a14cf1f029 Merge branch 'master' into new-menus 2021-01-10 21:31:09 -05:00
Jaime Ita Passos
3f1ae51936 Fix "missing initializer" warnings/errors in CVAR_INIT macros 2020-12-21 17:19:07 -03:00
Sally Coolatta
fc934b38e1 Merge public next 2020-11-10 15:32:48 -05:00
Sally Coolatta
e6a9e5a68e Merge branch 'master' into new-menus 2020-11-08 02:49:28 -05:00
James R
7e9922febf COM_LOCAL makes your commands NetXCmd free, FUCK NetXCmd 2020-11-05 20:16:28 -08:00
James R
d996a6a3b9 Fuck magic numbers; COM_ flags for Lua commands! 2020-11-05 20:16:26 -08:00
Sally Coolatta
7c2bd0d1c2 Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
James R
4c7400b27e Merge branch 'save-netvars' into 'next'
Save netvars

See merge request STJr/SRB2!1179
2020-10-12 19:03:01 -04:00
James R
6363162826 Merge branch 'sanity-meter-empty' into 'next'
Replace cvar initializers with a macro

See merge request STJr/SRB2!1178
2020-10-08 22:02:25 -04:00
James R
2a316e49e5 Revert netvars after leaving a netgame 2020-10-06 23:32:11 -07:00
James R
b7c4a82a0f Replace C90's junk with a modest macro 2020-10-06 23:04:23 -07:00
James R
67fbce8532 Autocomplete aliases in console 2020-08-14 00:00:45 -07:00
Sally Coolatta
5319ef434e Compiling reaches g_demo.c again after the merge 2020-08-12 22:40:15 -04:00
Sally Coolatta
e14f4a5842 Merge g_demo.c, remove OLD22DEMOCOMPAT 2020-08-10 12:14:23 -04:00
Sally Coolatta
6cf412e99a Merge command.h 2020-08-10 11:45:27 -04:00
Sally Coolatta
e296e1309a YAY, round 2 2020-08-09 21:02:56 -04:00
Sally Coolatta
7e9efd4e29 Merge lua_consolelib.c
Properly supports 3P/4P commands while we're at it too
2020-08-05 09:58:12 -04:00
James R
3554cc8b1b Actually save the cvar name in demos 2020-07-04 12:51:07 -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
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
15d18640de Merge remote-tracking branch 'public/master' into merge-12 2020-05-12 03:16:14 -04:00
James R
6613b19220 Merge remote-tracking branch 'lat/remove-passwords' into awful-mix-fucked 2020-04-26 01:16:27 -07:00
Latapostrophe
e801057559 Expose CV_FindVar to Lua 2020-03-10 18:12:20 +01:00
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
James R
40d080cfe1 Merge branch 'local-lua-commands' into 'next'
Local Lua commands + no magic numbers

See merge request STJr/SRB2!602
2020-01-08 16:14:30 -05: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
81bdd2d473 Merge remote-tracking branch 'origin/next' into local-lua-commands 2019-12-30 15:08:34 -08:00
James R
c7821da6b6 COM_LOCAL makes your commands NetXCmd free, FUCK NetXCmd 2019-12-29 21:07:28 -08:00
James R
2ab129b7bc Fuck magic numbers; COM_ flags for Lua commands! 2019-12-29 21:00:38 -08:00
James R
c8e08ec617 Expose CV_FindVar
(cherry picked from commit 0e9d69d6a3759686ca8bb567817be650291ea0e1)
2019-12-26 18:30:34 -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
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05: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
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
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
Latapostrophe
ec1272dd14 remove join passwords 2019-08-04 11:26:26 +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