thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
15929 commits 1 branch 12 tags 205 MiB
Commit graph

15929 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sally Coolatta
ecec1e8a8f OK the compiler still didn't like it, so just properly remove it entirely. 2020-08-10 17:22:55 -04:00
Sally Coolatta
65498a5c3a P_GetPlayerHeight is always player->mo->height 2020-08-10 17:15:02 -04:00
Sally Coolatta
1a058cb0cd Fix extra V_MAGENTAMAP definition 2020-08-10 17:07:47 -04:00
Sally Coolatta
4b29dae036 Fix extra AIMINGTODY 2020-08-10 17:06:12 -04:00
Sally Coolatta
27f289ea6e Fix random #endif in seg_t 2020-08-10 17:05:29 -04:00
Sally Coolatta
737f01fae0 Move axis_input_e to g_game.h 2020-08-10 17:04:02 -04:00
Sally Coolatta
3e50f83f63 Fix function definition for PlayerJoyAxis 2020-08-10 17:02:10 -04:00
Sally Coolatta
8071ec92e8 InputDown -> PlayerInputDown, JoyAxis -> PlayerJoyAxis 2020-08-10 17:00:45 -04:00
Sally Coolatta
fc10bf1d9a Fix conflicting info definitions 2020-08-10 16:49:54 -04: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
Sally Coolatta
68f95f2244 Fix musicdefs 2020-08-10 16:48:40 -04:00
Sally Coolatta
a30d20590c Merge hw_main.c 2020-08-10 16:23:48 -04:00
Sally Coolatta
dd89f333e2 Merge branch 'the-scary-22-merge' of https://git.magicalgirl.moe/KartKrew/Kart into the-scary-22-merge 2020-08-10 15:56:45 -04:00
Sally Coolatta
d2ecf0dd92 Use vanilla hw_bsp.c 2020-08-10 15:47:19 -04:00
SteelT
5271db81b7 Merge win32/win_dll.c 2020-08-10 15:41:49 -04:00
SteelT
7ad5057fe9 Merge win32/win_vid.c 2020-08-10 15:41:39 -04:00
SteelT
a93282d893 Forgot hw_light.h 2020-08-10 15:34:59 -04:00
SteelT
7d51db242d Merge hardware/hw_light.c 2020-08-10 15:33:36 -04:00
SteelT
0fed8c2ee3 Merge sdl/hwsym_sdl.c 2020-08-10 15:28:15 -04:00
Sally Coolatta
4e5d397eea Merge branch 'the-scary-22-merge' of https://git.magicalgirl.moe/KartKrew/Kart into the-scary-22-merge 2020-08-10 15:19:30 -04:00
Sally Coolatta
0b6621371c master m_menu again 2020-08-10 15:19:03 -04:00
SteelT
228f9e519a Merge Makefile 2020-08-10 15:18:09 -04:00
Sally Coolatta
cee33ab918 Merge p_local.h 2020-08-10 15:15:44 -04:00
Sally Coolatta
ca1d0bc2ff Merge branch 'the-scary-22-merge' of https://git.magicalgirl.moe/KartKrew/Kart into the-scary-22-merge 2020-08-10 15:15:40 -04:00
Sally Coolatta
479f843296 Merge y_inter.c/h 2020-08-10 15:14:03 -04:00
SteelT
65abcb35ef Merge config.h.in 2020-08-10 15:11:21 -04:00
Sally Coolatta
263bc682d2 Merge st_stuff.c 2020-08-10 15:09:58 -04:00
Sally Coolatta
9e7ed8f649 Merge s_sound.c/h 2020-08-10 15:09:24 -04:00
Sally Coolatta
efa2adbbb8 Merge r_skins.c 2020-08-10 15:03:09 -04:00
Sally Coolatta
37ab195a85 Merge r_main.c 2020-08-10 15:02:32 -04:00
Sally Coolatta
d5397935cd Merge r_draw.c 2020-08-10 15:01:57 -04:00
Sally Coolatta
f1c37f350a Merge p_user.c 2020-08-10 15:00:43 -04:00
Sally Coolatta
3ca9d2a72f Merge p_telept.c 2020-08-10 14:50:35 -04:00
Sally Coolatta
72af9d83ae Merge p_spec.c 2020-08-10 14:48:49 -04:00
Sally Coolatta
335deb80cd Merge p_setup.c 2020-08-10 14:43:24 -04:00
Sally Coolatta
cca0afde06 Merge p_saveg.c 2020-08-10 14:42:17 -04:00
Sally Coolatta
6a9b68cc88 Merge p_polyobj.c 2020-08-10 14:39:11 -04:00
Sally Coolatta
2f9f1df768 Merge p_mobj.h 2020-08-10 14:37:56 -04:00
Sally Coolatta
0c06da879e Merge p_mobj.c 2020-08-10 14:37:15 -04:00
Sally Coolatta
ed031e344e Merge p_map.c 2020-08-10 14:34:29 -04:00
Sally Coolatta
0cd5d2e903 Merge p_inter.c 2020-08-10 14:27:26 -04:00
Sally Coolatta
3f68fa02d1 Merge hu_stuff.c 2020-08-10 14:21:22 -04:00
Sally Coolatta
9915d443dc Merge branch 'the-scary-22-merge' of https://git.magicalgirl.moe/KartKrew/Kart into the-scary-22-merge 2020-08-10 13:09:31 -04:00
Sally Coolatta
a771bb0047 Merge g_game.c/h 2020-08-10 13:09:26 -04:00
SteelT
9759c3666b Merge win32/Srb2win-vc10.vcxproj.filters 2020-08-10 13:06:14 -04:00
SteelT
fd000248b7 Merge sdl/i_video.c 2020-08-10 13:03:41 -04:00
SteelT
428ac51c68 Merge w_wad.c 2020-08-10 12:57:47 -04:00
Sryder
9a7c33e91f Merge branch 'the-scary-22-merge' of git@git.magicalgirl.moe:KartKrew/Kart.git into the-scary-22-merge 2020-08-10 17:40:12 +01:00
Sryder
67486dc0b6 Fix Simple opengl merge conflicts 
hw_cache.c, hw_data.h, hw_defs.h, hw_dll.h, hw_draw.c, hw_drv.h, hw_glob.h, hw_md2.c, hw_md2.h, r_opengl.c
 2020-08-10 17:39:34 +01:00
SteelT
676bdc8cba Merge lua_mobjlib.c 2020-08-10 12:34:39 -04:00