Commit graph

489 commits

Author SHA1 Message Date
James R
b681b6e9e6 Do not do master server things when NOCURL 2020-08-16 21:42:58 -07:00
Sal
80d37b1939 Merge branch 'http-mserv' into 'master'
Make the HTTP Master Server official

See merge request KartKrew/Kart-Public!193
2020-08-10 16:49:47 -04:00
AJ Martinez
4f1642bbce Clarify addon-related messages 2020-08-05 00:40:56 -05:00
James R
d8220e6748 ok
(cherry picked from commit 0b9c20cc7086000548e02b39c1abf94ffb56feae)
2020-05-15 11:21:40 -07:00
James R
9056ca0525 Merge remote-tracking branch 'origin/master' into http-mserv 2020-05-12 17:50:32 -07:00
Latapostrophe
6bf117300b Add back viewpoint names & fix console inputs in replays 2020-04-30 15:50:30 +02:00
James R
2e6e13cc07 Merge remote-tracking branch 'lat/awful-mix' into awful-mix-fucked 2020-04-28 21:56:35 -07:00
James R
29bf51bc99 Make mod update, room list and server list multithreaded
This took fucking ages and it still fails sometimes in edge cases, but I
don't give a FUCK right now.
2020-04-26 19:46:35 -07:00
James R
6613b19220 Merge remote-tracking branch 'lat/remove-passwords' into awful-mix-fucked 2020-04-26 01:16:27 -07:00
Sally Cochenour
f2aa2bb541 'sal-lighting' code ports from v2 2020-04-25 20:56:50 -04:00
ThatAwesomeGuy173
3e37730545 Use "addons" instead of "add-ons" for consistency 2020-04-22 01:24:59 -06:00
ThatAwesomeGuy173
4c73e651cf Capitalize "record attack" as "Record Attack" and spell "addons" as "add-ons" in the replay hut 2020-04-22 00:01:03 -06:00
James R
d15024482d Kill the old mserv, long live HMS! 2020-04-13 22:23:01 -07:00
Wolfy
5e4ec61d82 Merge remote-tracking branch 'remotes/bird/isolatedbatching' into awful-mix
# Conflicts:
#	src/hardware/hw_cache.c
#	src/hardware/hw_draw.c
#	src/hardware/hw_glob.h
#	src/hardware/hw_main.c
#	src/r_bsp.h
#	src/r_data.c
2020-04-11 23:47:25 -05:00
Latapostrophe
4dfb47dff6 Merge branch 'record-attack-changes' into v1.2-frankeinstein 2020-03-10 20:27:00 +01:00
Latapostrophe
3a8e984e44 Merge branch 'fickle-replay-v1' into replay-freecam-rewind 2020-03-05 21:08:20 +01:00
TehRealSalt
7d32f9b6c3 Replay playback changes:
- Store level state periodically
- Load the closest usable level state when done rewinding for
  quicker resumes
- Make playback menu fade out after 5 seconds of no activity
  (but not while paused)
- Remove wrapping from replay hut (original wrapping was broken
  at some point before 1.1 and it's not necessary anyway)
- Allow holding enter on frame advance for noisy slow-mo

from fickleheart
2020-03-05 21:04:56 +01:00
fickleheart
7025a23f25 Merge remote-tracking branch '[remote name redacted]/jimita-shaders'
# Conflicts:
#	src/hardware/hw_main.c
2019-12-01 11:58:24 -06:00
Latapostrophe
1d66d8e213 replay freecam + enhancements 2019-09-05 23:24:23 +02:00
Latapostrophe
aeb89fbdf3 shorten RA intro & allow to restart with pause 2019-09-01 23:04:07 +02:00
Latapostrophe
ec1272dd14 remove join passwords 2019-08-04 11:26:26 +02:00
Sryder
269050ecc7 Merge branch 'lemme-outa-room-menu' into 'master'
Don't get stuck in room menu in a modified game

See merge request KartKrew/Kart-Public!145
2019-06-27 14:16:37 -04:00
James R
76c5e3d6fe Spell it "forward" 2019-06-22 21:40:20 -07:00
James R
a6b7c0a996 Don't get stuck in room menu in a modified game 2019-06-19 14:32:11 -07:00
Latapostrophe
335be454f3 change default fog settings, put sprite billboarding in menus and attempt to make colormaps look nicer still 2019-06-17 21:27:31 +02:00
Jaime Passos
a37d742561 software is better 2019-06-13 21:10:01 -03:00
Jaime Passos
c85d181df9 Open Graphics Library (OpenGL) is a cross-language, cross-platform application programming interface (API) for rendering 2D and 3D vector graphics. The API is
typically used to interact with a graphics processing unit (GPU), to achieve hardware-accelerated rendering.
2019-06-12 23:01:18 -03:00
Latapostrophe
fc33255db4 Fix stuff and reimplement the kart features that went poof 2019-06-12 21:36:47 +02:00
Latapostrophe
a35cea9243 chaos conflict 2019-06-11 17:02:47 +02:00
Jaime Passos
157b510f2b Merge remote-tracking branch 'upstream/master' into gl_shaders 2019-06-10 16:21:46 -03:00
James R
38360f29ec Move FOV option out of OGL options 2019-05-22 23:16:20 -07:00
James R
e1451b7a98 Acknowledge fallback models as an OGL option indeed
(You may also be able to actually read that code too.)
2019-05-22 23:15:46 -07: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
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
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