Sally Coolatta
|
a6b2bc99de
|
Demo variable fixes
|
2020-08-10 19:42:45 -04:00 |
|
Sally Coolatta
|
78d4d3c3e9
|
Fix broken indenting in D_Display
|
2020-08-10 19:30:05 -04:00 |
|
SteelT
|
84a4c7ba62
|
Fix some more ifdefs
|
2020-08-10 18:57:58 -04:00 |
|
SteelT
|
9446a397d6
|
Remove some stray endifs
|
2020-08-10 18:45:32 -04:00 |
|
Sally Coolatta
|
a68d68f8db
|
Some D_Display issues
|
2020-08-10 17:29:27 -04:00 |
|
Sally Coolatta
|
c2d1f96bb3
|
Missed G_DemoTitleResponder definition
|
2020-08-10 17:26:01 -04:00 |
|
Sally Coolatta
|
fef19410fd
|
Merge hw_main.h
|
2020-08-10 17:25:44 -04:00 |
|
Sally Coolatta
|
6906b56b4a
|
Duplicate defs
|
2020-08-10 17:23:20 -04:00 |
|
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 |
|