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
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
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
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
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
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
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
James R
b28221bdb2
Don't count down wait timer when executing a command
2019-04-14 15:17:47 -07: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
James R
bfcb6cc67e
Try to fix compiler errors
2019-02-24 17:47:33 -08: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
1d58c6b8c2
merge srb2 next
2019-01-05 15:59:23 -05:00
mazmazz
4e055bd383
Properly restrict EXECVERSION from cvar updates
2018-12-20 17:56:51 -05:00
mazmazz
e8584f2535
Implement EXECVERSION consvar to invalidate previous versions' default config values
2018-12-06 06:28:34 -05:00
TehRealSalt
4507ee18fd
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
mazmazz
c91b2b4456
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
TehRealSalt
c3c39182fb
Address review
...
(for anything code I did, anyway)
2018-09-20 17:11:11 -04:00
