thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-11 02:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
16229 commits 2 branches 14 tags 206 MiB
Commit graph

16229 commits

This branch
This branch
All branches
Author SHA1 Message Date
James R
42dbdd8c4a Merge branch 'http-mserv' into 'next' 
HTTP Based Master Server + Multithreading

See merge request STJr/SRB2!940
 2020-08-09 20:24:26 -04:00
SteelT
a5313e34fe Merge st_stuff.c/h 2020-08-09 20:23:09 -04:00
James R
866f436f5c Merge branch 'lmaogalog' into 'next' 
Make old analog functional again

See merge request STJr/SRB2!1098
 2020-08-09 20:13:04 -04:00
Sally Coolatta
90bd22aac3 Replace m_menu with ours 
No, we're not fixing 229 conflicts for a file that we're completely deleting later.
 2020-08-09 20:08:11 -04:00
Sally Coolatta
aeeedac1ea Merge hw_md2.c 2020-08-09 19:35:13 -04:00
Sally Coolatta
b8a1975c37 Merge branch 'the-scary-22-merge' of https://git.magicalgirl.moe/KartKrew/Kart into the-scary-22-merge 2020-08-09 19:13:05 -04:00
Sally Coolatta
f317b327b2 Merge p_user.c 2020-08-09 19:11:46 -04:00
SteelT
b4f9f2a98c Merge sounds.c/h 2020-08-09 19:02:53 -04:00
Sally Coolatta
f6ad84f572 and h 2020-08-09 16:05:06 -04:00
Sally Coolatta
9612fd4854 Merge v_video.c/h 2020-08-09 16:04:57 -04:00
Sally Coolatta
565786011f Merge Makefile 2020-08-09 15:54:36 -04:00
Sally Coolatta
c64d8e11d2 Merge Makefile.cfg 2020-08-09 15:52:32 -04:00
Sally Coolatta
4f47775d51 Merge y_inter.c/h 2020-08-09 15:47:37 -04:00
Sally Coolatta
68f9edf86b Merge p_spec.c/h 2020-08-09 15:31:23 -04:00
Sally Coolatta
0de25ce771 Merge p_inter.c 2020-08-09 15:15:52 -04:00
Sally Coolatta
153492c20c Finish removals properly 2020-08-09 14:46:03 -04:00
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
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
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
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
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