Commit graph

16729 commits

Author SHA1 Message Date
Sally Coolatta
20dcd07fa4 Merge g_game.c/h
Also includes required changes to g_demo.c/h
2020-08-09 14:43:13 -04:00
GoldenTails
ab2bc63002 Fix string drawing functions so they account for V_NOSCALEPATCH effectively multiplying the width of the screen 2020-08-09 11:03:02 -05:00
Ashnal
6af76ee948 Now that the server doesn't erroneously send the last mainwad
As the first part of fileneeded, we must load file 0
2020-08-09 00:48:53 -04:00
Ashnal
6ff69726a6 Redo logic for lots of files vs not
Now new CL state for checking files so it can spread over tics
whether we ask for the extended list or not
2020-08-09 00:47:55 -04:00
James R
9955ff1357 Merge branch 'kill-dos' into 'next'
Remove support for DOS

See merge request STJr/SRB2!1090
2020-08-08 21:26:18 -04:00
Sally Coolatta
7e644a5de3 Merge d_player.h 2020-08-08 19:29:30 -04:00
Sally Coolatta
f4b98baef1 Merge branch 'the-scary-22-merge' of https://git.magicalgirl.moe/KartKrew/Kart into the-scary-22-merge 2020-08-08 19:08:22 -04:00
Sally Coolatta
3f1d58754e Merge r_things.c/h
Includes r_skins, obviously, but also a little bit of m_cond to make availabilities better for kart's purposes
2020-08-08 19:08:19 -04:00
James R
7382602e3c Match MAXSERVERLIST to MAXNETNODES, increase MAXNETNODES
Each server in the server list requires a node. It's also MAXNETNODES-1 because
the first node is yourself.

(cherry picked from commit bad06eba17)
2020-08-08 15:13:21 -07:00
SteelT
fe938117fd Merge p_pspr.h 2020-08-08 18:11:19 -04:00
James R
2e3b0ae4c8 Merge remote-tracking branch 'origin/next' into http-mserv 2020-08-08 15:05:03 -07:00
SteelT
ed91ca6244 Merge p_local.h 2020-08-08 17:57:45 -04:00
Sally Coolatta
4b5c7d7510 Merge r_segs.c 2020-08-08 17:10:46 -04:00
Sally Coolatta
2af68a5fe7 Merge r_plane.c 2020-08-08 17:04:26 -04:00
Sally Coolatta
6bf6b16ff7 Merge r_main.c/h 2020-08-08 16:58:48 -04:00
SteelT
f897061629 Merge r_draw.h 2020-08-08 16:20:10 -04:00
SteelT
9cfe5513c2 Merge p_tick.c 2020-08-08 15:40:24 -04:00
Sally Coolatta
7accb3f8d2 Merge p_mobj.c/h 2020-08-08 15:22:29 -04:00
Jaime Passos
ed068a7664 Fix buffer overrun in I_ClipboardPaste 2020-08-08 15:36:01 -03:00
Jaime Passos
368e550ab1 Shader code cleanup 2020-08-07 18:17:05 -03:00
Steel Titanium
913c07959e Kill CD support 2020-08-07 17:06:19 -04:00
Steel Titanium
1c588cef63 Remove all this unused playlist related code 2020-08-07 16:44:16 -04:00
Steel Titanium
e302f17bbb Remove every musserv and sndserv def'd code 2020-08-07 16:40:46 -04:00
James R
559029511b Update sounds with correct volume 2020-08-07 13:10:13 -07:00
James R
0e0015cb44 And remove the limit on S_SetSfxVolume :V 2020-08-07 13:02:35 -07:00
James R
aedc5ae7af Kill MIDI more >:) 2020-08-07 13:00:04 -07:00
James R
72e225f8c9 Rename digmusicvolume to musicvolume, default soundvolume and musicvolume to 100% 2020-08-07 12:43:59 -07:00
James R
9077a4ff03 Kill MIDI 2020-08-07 12:39:08 -07:00
James R
374d032a6b Clean up stuff, make volume work again 2020-08-07 12:29:37 -07:00
James R
7adf2159f6 Reduce songs and sounds to 1/4 volume, add a musicdef option for volume 2020-08-06 21:24:41 -07:00
James R
11a4ca28d7 Remove PF_SKIDDOWN, just use PF_FAULT 2020-08-06 17:59:09 -07:00
Sally Coolatta
e502ff9a0a Merge r_bsp.c/h 2020-08-06 19:33:01 -04:00
Sally Coolatta
5ec387451a Merge branch 'the-scary-22-merge' of https://git.magicalgirl.moe/KartKrew/Kart into the-scary-22-merge 2020-08-06 19:21:04 -04:00
Sally Coolatta
9f869ec466 Merge r_data.c/h 2020-08-06 19:20:51 -04:00
SteelT
6106589507 Merge src/w_wad.c/h 2020-08-06 18:52:39 -04:00
SteelT
30fd6f5db5 Merge src/r_defs.h 2020-08-06 18:36:30 -04:00
SteelT
ef8fd7b671 Merge src/r_state.h 2020-08-06 18:17:12 -04:00
SteelT
af9e73cef0 Easy conflicts - src/win32/win_dll.c and src/win32/win_vid.c 2020-08-06 18:10:16 -04:00
Sally Coolatta
a73b9a9a0d Merge p_slopes.c 2020-08-06 17:58:30 -04:00
Sally Coolatta
337db54965 Missed this in p_setup.c 2020-08-06 17:55:36 -04:00
Sally Coolatta
438743ce97 Merge doomstat.h 2020-08-06 17:53:35 -04:00
Sally Coolatta
59eb714bef Merge doomdef.h 2020-08-06 17:42:29 -04:00
Sally Coolatta
95fc67e4a6 Merge branch 'the-scary-22-merge' of https://git.magicalgirl.moe/KartKrew/Kart into the-scary-22-merge 2020-08-06 17:38:33 -04:00
Sally Coolatta
cdb0310982 Merge info.c/h 2020-08-06 17:38:29 -04:00
SteelT
9a75d397d6 Merge src/s_sound.c/h 2020-08-06 16:56:41 -04:00
Sally Coolatta
43c627b02e Merge f_finale.c/h 2020-08-06 15:35:07 -04:00
Sal
954a21123a Merge branch 'indirectitemcooldown' into 'next'
Fix Shrink, SPB and Hyudoro cooldowns never resetting?

See merge request KartKrew/Kart-Public!191
2020-08-06 12:19:27 -04:00
Sally Coolatta
ddfd7a4772 Merge branch 'master' into next 2020-08-06 12:15:55 -04:00
AJ Martinez
e5463afb58 Fix Hyudoro cooldown never resetting 2020-08-06 10:51:53 -05:00
Sally Coolatta
b9886a166e Merge p_setup.c 2020-08-06 11:42:16 -04:00