Commit graph

446 commits

Author SHA1 Message Date
Latapostrophe
c54cc42e74 Add command to disable followers clientside 2019-05-13 19:53:17 +02:00
Latapostrophe
a0e27c22e7 make followers work with replays 2019-05-12 13:41:46 +02:00
Latapostrophe
c83127293b resolve conflict in m_menu 2019-05-12 10:48:54 +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
Latapostrophe
1a7af92d9f fix being unable to remove follower outside of netgames 2019-05-12 10:34:10 +02:00
wolfy852
54d61b188c Have "None" work as an alias for -1 2019-05-12 03:07:17 -05:00
wolfy852
e4af44956b Merge remote-tracking branch 'remotes/pub/next' into followme
# Conflicts:
#	src/r_things.h
2019-05-11 02:05:58 -05:00
wolfy852
1b7d7cabdf Correct a merge mistake 2019-05-07 02:06:59 -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
TehRealSalt
d82fa7eb60 Merge branch 'v1' into no-limits 2019-05-06 21:55:33 -04:00
TehRealSalt
f48a08cd53 Merge v1 2019-05-06 21:23:29 -04:00
wolfy852
f808072937 Merge remote-tracking branch 'remotes/pub/next' into v1
# Conflicts:
#	src/hardware/hw_main.c
#	src/hardware/hw_main.h
#	src/m_menu.c
#	src/r_main.c
#	src/v_video.c
2019-05-06 14:26:09 -05:00
wolfy852
4eb2a7d2eb Merge remote-tracking branch 'remotes/pub/master' into next 2019-05-06 14:17:02 -05:00
wolfs
741f48132a Merge branch 'newping' into 'master'
New ping command

See merge request KartKrew/Kart-Public!123
2019-05-06 15:12:56 -04:00
Sal
7c0d0d4cb1 Merge branch 'save-d_clisrv-cvars' into 'master'
Register showjoinaddress after the config loads and match some other cvars to its behavior

See merge request KartKrew/Kart-Public!135
2019-05-02 10:04:45 -04:00
TehRealSalt
f1f664e9b1 Merge v1 2019-05-02 01:36:19 -04:00
TehRealSalt
3a707c093b Add options for adjusting deadzone, increase default deadzone from 0.25 to 0.5 2019-05-01 23:30:53 -04:00
toaster
9e24d4aba7 Completely untested -encore parameter for the map command; inverts cvar value. 2019-04-28 19:26:11 +01:00
James R
fd251ed29f Move some cvars out of D_ClientServerInit and save them 2019-04-27 17:30:39 -07:00
TehRealSalt
089be795a2 Huge splitscreen refactor
Did not get to finish all refactoring or even compile this, I'll continue later
2019-04-18 03:08:11 -04:00
fickleheart
7253f0e499 Strip out things that limit wad files added by filename 2019-04-17 23:09:10 -05:00
fickleheart
25f55b6351 Add VHS pause/rewind effect 2019-04-08 23:21:11 -05:00
James R
03c27101df "NEWPING" might as well be the only ping 2019-04-08 15:48:20 -07:00
Wolfy
2c21b62f65 Merge remote-tracking branch 'remotes/public/master' into followme 2019-04-06 13:48:46 -05:00
fickleheart
c466412902 Begin work on playback menu 2019-04-05 02:38:48 -05:00
Monster Iestyn
4f58d00eec Merge branch 'master' into next 2019-04-02 15:47:07 +01:00
Steel Titanium
e47854880a Merge branch 'next' of git.magicalgirl.moe:KartKrew/Kart-Public into forceskin-by-name 2019-03-27 19:18:51 -04:00
James R
841daf940f Don't close console when changing map 2019-03-26 13:04:11 -07:00
fickleheart
8d9462d4aa Refactor replay saving handler for later use 2019-03-24 21:55:08 -05:00
fickleheart
f60e92aa70 Move public demo vars to a single struct 2019-03-24 21:32:15 -05:00
fickleheart
fa28feb8db Add command to lower netreplay sync frequency
This makes for smaller replay files while keeping
sync checks in place!
2019-03-19 23:39:04 -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
Monster Iestyn
5d059da843 Added the Gametype_Names array and G_GetGametypeByName for ease in converting gametype nums to strings and vice versa
gametype_cons_t is now initialised using the Gametype_Names array, like how Color_cons_t is initialised using Color_Names

# Conflicts:
#	src/doomstat.h
#	src/m_menu.c
2019-03-18 22:00:23 +00:00
fickleheart
5c4c0a5ff6 Merge remote-tracking branch 'remotes/upstream/next' into HEAD 2019-03-11 21:53:53 -05:00
Steel Titanium
df8a5ffc1e Change array size from MAXSKINS+1 to MAXSKINS+2
Also Set the values to 0/NULl, it will be overwritten later when a skin is assigned to the slot.
2019-03-11 22:11:36 -04:00
Steel Titanium
12d0d6ff77 Merge branch 'next' of git.magicalgirl.moe:KartKrew/Kart-Public into forceskin-by-name 2019-03-11 21:54:53 -04:00
James R
b91701c948 Miscellaneous window de-focus options
Music pausing is now optional.
Sounds may be paused--on by default.
The game itself being paused in off-line mode is now optional.

(showfocuslost now loads from config.)
2019-03-11 14:57:11 -07:00
fickleheart
f4486cb117 Remove unnecessary padding byte from stored challenge answers 2019-03-10 17:54:17 -05:00
fickleheart
6fe9a6bd06 Merge remote-tracking branch 'remotes/upstream/next' into join-passwords 2019-03-10 12:35:07 -05:00
Alam Arias
6560740234 Merge branch 'next' into ping-stuff-take2 2019-03-09 22:02:11 -05:00
fickleheart
bc647657f4 Fix password auto-hiding if you type into it 2019-03-09 17:06:44 -06:00
fickleheart
f388416264 Use consts in place of some 16s 2019-03-09 16:46:55 -06:00
Latapostrophe
dca6d8094a Change default showping from Warning to Always 2019-03-09 22:01:52 +01:00
fickleheart
180bc0eaee Add join password to server host menu 2019-03-09 15:00:48 -06:00
fickleheart
b696e68def Recycle oldest challenges first if all are taken 2019-03-06 22:36:13 -06:00
fickleheart
a1b2eaa7fc Add -remove option to joinpassword 2019-03-06 21:30:39 -06:00
fickleheart
b9543d18b4 hblurgle spburgle this code sucks 2019-03-05 22:27:25 -06:00
Steel Titanium
5b369ad21e Allow names to be used with forceskin 2019-03-05 19:04:15 -05:00
fickleheart
eae568f03c Merge remote-tracking branch 'remotes/netreplays/docs' into new_netreplays 2019-03-03 21:06:53 -06:00
fickleheart
3918d5e177 Fix missing argument in G_AdjustView call 2019-03-03 20:33:59 -06:00