Commit graph

466 commits

Author SHA1 Message Date
TehRealSalt
1e7b79144d Nice things
- Fix off-by-one error in shieldout code
- Added KartItemCVars array for anything to use
- More I_Asserts in item logic
2019-05-20 14:17:16 -04:00
TehRealSalt
480d56838f Add cvars to prevent issues 2019-05-20 00:50:44 -04:00
TehRealSalt
bb6fe9fc54 Merge branch 'master' into rings 2019-05-14 22:26:22 -04:00
TehRealSalt
62aeeea9cb Fix a couple of things not using pure white 2019-05-13 12:50:36 -04:00
TehRealSalt
dc41fe3d8d Port over only the relevant changes from the reduced-palette branch, update some of the Kart-specific stuff 2019-05-12 17:19:49 -04:00
TehRealSalt
5c3cac52e6 Merge branch 'master' into rings 2019-05-12 15:28:15 -04:00
wolfy852
08bf9ee1f5 whoops
Fixes stupid obvious mistakes and changes the prefcolor reset to item.
2019-05-12 04:22:34 -05: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
5613446b6f Have Look Back reset your color to prefcolor 2019-05-12 03:21:46 -05:00
TehRealSalt
3d129ad4ca Merge branch 'v1' into rings 2019-05-06 23:54:20 -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
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
TehRealSalt
8f4d93995b Merge v1 2019-05-02 17:51:54 -04:00
TehRealSalt
2c49feeb9c ENSURE viewcount slider is present for multiplayer demos 2019-05-02 12:42:29 -04:00
TehRealSalt
00a3ea58ee Add message boxes for file add errors 2019-05-02 12:03:50 -04:00
TehRealSalt
3fdd51736b HORRID HACK around holding enter in the playback menu having awful, crash-causing side-effects 2019-05-02 12:00:51 -04:00
Sal
26159aae2a Merge branch 'deadzone-bullshit' into 'v1'
Add options for adjusting deadzone, increase default deadzone from 0.25 to 0.5

See merge request KartKrew/Kart!147
2019-05-02 09:25:07 -04:00
TehRealSalt
f1f664e9b1 Merge v1 2019-05-02 01:36:19 -04:00
TehRealSalt
fe28094c0c Menu fix-up
- Use center menu style for the tiny extras menu
- Move Screenshot Options, Add-on Options, Replay Options, and Erase Data into Data Options again
2019-05-02 01:33:11 -04:00
TehRealSalt
8a1ff31d1d Remove bad +1 2019-05-02 00:49:05 -04:00
Sal
18d9f18a41 Merge branch 'default-md2' into 'v1'
Add option to turn off the PLAY default md2

See merge request KartKrew/Kart!140
2019-05-02 00:03:18 -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
wolfs
ab8006ea1d Merge branch 'md3-vanilla-kart' into 'next'
MD2/MD3 support rewritten + optimizations [GCC port]

See merge request KartKrew/Kart-Public!19
2019-04-30 15:22:30 -04:00
Latapostrophe
dab5469b4a Terminology changes 2019-04-23 23:49:46 +02:00
Latapostrophe
60428fbc29 Add option to turn off the PLAY default md2 2019-04-22 11:29:44 +02:00
James R
7dae0ad875 Show rooms list in server browser initially
If you haven't selected a room yet, you're
shown the room list instead of server list.
2019-04-18 22:41:50 -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
a6879cca69 Keep playback menu bar on the top in non-green reses 2019-04-14 23:22:24 -05:00
fickleheart
7911558eba Add scroll bar to replay hut 2019-04-14 23:17:12 -05:00
fickleheart
5b1c3efb86 Temporarily disable Extra Options menu 2019-04-13 15:23:31 -05:00
fickleheart
5e703807eb Change color of active playback items 2019-04-13 15:23:23 -05:00
fickleheart
830b608a15 Playback menu improvements 2019-04-13 14:42:15 -05:00
fickleheart
1ba5412bfe Fix being able to carry rewind state where it shouldn't be 2019-04-13 14:22:48 -05:00
wolfy852
aec9e721dc Generic model terminology 2019-04-12 00:35:35 -05:00
fickleheart
65e272f892 Proposal: VHS effect over the replay hut background? 2019-04-10 09:10:09 -05:00
Sryder
04895c72d3 Turn the INT8's into SINT8's 2019-04-09 19:34:34 +01:00
James R
03c27101df "NEWPING" might as well be the only ping 2019-04-08 15:48:20 -07:00
TehRealSalt
94fbb2c783 Merge master 2019-04-07 14:54:10 -04:00
fickleheart
77c71ca944 Support playback menu for record attack replays too 2019-04-06 18:59:11 -05:00
fickleheart
3787e90781 Fix title menu not working if you leave a replay early 2019-04-06 18:17:56 -05:00
fickleheart
d9e061d999 Various fixes and tweaks to rewinds 2019-04-06 18:06:02 -05:00
fickleheart
3f66c68a65 Allow backwards frame advance while paused 2019-04-06 15:36:53 -05:00
fickleheart
25ff05fdd0 Add demo rewinding
Preview is fairly basic, and only shows players
rewinding. Full state is restored via reloading
the replay and jumping to the timestamp once
the rewind is done.
2019-04-06 14:51:00 -05:00
fickleheart
c7125c862c Support non-green resolutions in the replay hut 2019-04-06 11:16:19 -05:00
fickleheart
ce7577eb3a Reference graphics for menu and other stuff 2019-04-06 02:17:30 -05:00