Commit Graph

432 Commits

Author SHA1 Message Date
wolfy852 f61f7f4411 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 777f1675fc Correct a merge mistake 2019-05-07 02:06:59 -05:00
wolfy852 2c363c4e1e 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 47484c5b6b Merge branch 'v1' into no-limits 2019-05-06 21:55:33 -04:00
TehRealSalt f720dd3ddb Merge v1 2019-05-06 21:23:29 -04:00
wolfy852 97493fdfd7 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 535b386f8e Merge remote-tracking branch 'remotes/pub/master' into next 2019-05-06 14:17:02 -05:00
wolfs 58c5979a1e Merge branch 'newping' into 'master'
New ping command

See merge request KartKrew/Kart-Public!123
2019-05-06 15:12:56 -04:00
Sal a12fb1c81d 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 201466b1c1 Merge v1 2019-05-02 01:36:19 -04:00
TehRealSalt 39bea80b9e Add options for adjusting deadzone, increase default deadzone from 0.25 to 0.5 2019-05-01 23:30:53 -04:00
toaster 031ffbf304 Completely untested -encore parameter for the map command; inverts cvar value. 2019-04-28 19:26:11 +01:00
James R 848bb10c36 Move some cvars out of D_ClientServerInit and save them 2019-04-27 17:30:39 -07:00
TehRealSalt 1f61397545 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 430831423c Strip out things that limit wad files added by filename 2019-04-17 23:09:10 -05:00
fickleheart ae473585b7 Add VHS pause/rewind effect 2019-04-08 23:21:11 -05:00
James R 42d47a10f3 "NEWPING" might as well be the only ping 2019-04-08 15:48:20 -07:00
fickleheart e948b8ba48 Begin work on playback menu 2019-04-05 02:38:48 -05:00
Monster Iestyn ab0fe6b164 Merge branch 'master' into next 2019-04-02 15:47:07 +01:00
Steel Titanium ae74b5cb9d
Merge branch 'next' of git.magicalgirl.moe:KartKrew/Kart-Public into forceskin-by-name 2019-03-27 19:18:51 -04:00
James R 9a350eb879 Don't close console when changing map 2019-03-26 13:04:11 -07:00
fickleheart b2cbe3ed6d Refactor replay saving handler for later use 2019-03-24 21:55:08 -05:00
fickleheart 4b7d2aea84 Move public demo vars to a single struct 2019-03-24 21:32:15 -05:00
fickleheart 29c6dae776 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 7fc1f02b07 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 2fb569857a 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 c30c3f7a3a Merge remote-tracking branch 'remotes/upstream/next' into HEAD 2019-03-11 21:53:53 -05:00
Steel Titanium d6046088a0
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 b6572eceae
Merge branch 'next' of git.magicalgirl.moe:KartKrew/Kart-Public into forceskin-by-name 2019-03-11 21:54:53 -04:00
James R 0f9648eac0 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 c0ea785900 Remove unnecessary padding byte from stored challenge answers 2019-03-10 17:54:17 -05:00
fickleheart 426f4192be Merge remote-tracking branch 'remotes/upstream/next' into join-passwords 2019-03-10 12:35:07 -05:00
Alam Arias d58cb1aae3 Merge branch 'next' into ping-stuff-take2 2019-03-09 22:02:11 -05:00
fickleheart d804dc3a34 Fix password auto-hiding if you type into it 2019-03-09 17:06:44 -06:00
fickleheart 5f0c4271d7 Use consts in place of some 16s 2019-03-09 16:46:55 -06:00
Latapostrophe b17c4e562e Change default showping from Warning to Always 2019-03-09 22:01:52 +01:00
fickleheart 1b6035e322 Add join password to server host menu 2019-03-09 15:00:48 -06:00
fickleheart 219b240bcf Recycle oldest challenges first if all are taken 2019-03-06 22:36:13 -06:00
fickleheart b5c4866706 Add -remove option to joinpassword 2019-03-06 21:30:39 -06:00
fickleheart 264454ca70 hblurgle spburgle this code sucks 2019-03-05 22:27:25 -06:00
Steel Titanium ab4669978a Allow names to be used with forceskin 2019-03-05 19:04:15 -05:00
fickleheart 353ea7d671 Merge remote-tracking branch 'remotes/netreplays/docs' into new_netreplays 2019-03-03 21:06:53 -06:00
fickleheart 272ba600e2 Fix missing argument in G_AdjustView call 2019-03-03 20:33:59 -06:00
fickleheart 4b2938a540 Merge remote-tracking branch 'remotes/netreplays/double-cmp-fix' into new_netreplays 2019-03-03 20:29:52 -06:00
fickleheart 38d672620d Merge remote-tracking branch 'remotes/netreplays/view-by-raceplace' into new_netreplays 2019-03-03 20:29:46 -06:00
fickleheart 56269cb62b Merge remote-tracking branch 'remotes/netreplays/setviews-command' into new_netreplays 2019-03-03 20:29:40 -06:00
Sally Cochenour a993cffb69 Modify a few colors
- The following colors were given either more noticeable highlights or deeper shading for better colorized WANTED poster appearance: Nickel, Black, Beige, Brown, Leather, Salmon, Red, Crimson, Pumpkin, Rosewood, Burgundy, Pinetree, Swamp, Periwinkle, Blue, Blueberry, Dusk, Purple, Lavender, and Byzantium.
- Fixed an off-looking purple tone on Ruby.
- Salmon's outline & shading was made darker, to make it slightly easier on the eyes.
- Peach recieved a complete overhaul, featuring high contrast and yellow highlights.
- Add kartdebugcolorize for taking a quick glance at all of the colorizations
2019-02-26 04:30:51 -05:00
James R 04980044a1 I am pretty dumb 2019-02-21 22:54:09 -08:00
James R 1b2813b9d5 Document the playdemo command 2019-02-20 19:25:56 -08:00
james c32d7f6745 Add race placement criteria to view command 2019-02-20 19:13:32 -08:00