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
15860 commits 1 branch 12 tags 205 MiB
Commit graph

15860 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sally Coolatta
f9ca40e673 Merge branch 'master' into the-scary-22-merge 2020-08-12 20:59:09 -04:00
Sally Coolatta
7b4d84c3f3 Merge remote-tracking branch 'public/master' 2020-08-12 18:55:43 -04:00
Sally Coolatta
f8d1e75025 Merge remote-tracking branch 'public/next' 2020-08-12 18:50:41 -04:00
Sally Coolatta
bb988d1dd3 Minor fixes to g_demo 2020-08-12 18:45:55 -04:00
Sally Coolatta
bca2e508ed Use kart's f_wipe 2020-08-12 18:15:28 -04:00
Sally Coolatta
135e9b9797 f_finale now compiles 2020-08-11 23:13:25 -04:00
Sryder
7f9850644b A few opengl file build fixes 
Also ogl_win.c had a merge conflict remaining apparently.
 2020-08-12 00:12:42 +01:00
Sally Coolatta
b9436ee015 More fixing up 
Got tired again, but now it makes it to f_finale
 2020-08-11 18:46:00 -04:00
Sally Coolatta
8731c6b7a4 Another round of fixing up 
- gametyperules are now fitting for kart, not applied to the whole codebase though
- a few more files compile
 2020-08-11 16:13:17 -04:00
Sally Coolatta
b7078fa8b6 Merge branch 'the-scary-22-merge' of https://git.magicalgirl.moe/KartKrew/Kart into the-scary-22-merge 2020-08-11 10:57:56 -04:00
Sally Coolatta
62c8dde759 Last few warnings in d_clisrv 2020-08-11 10:57:53 -04:00
SteelT
4631465b01 Restore important fields in skin struct that somehow went away 2020-08-10 23:53:26 -04:00
Sally Coolatta
a50a9a1843 Lots of splitscreen fixes 
LOTS of stuff I changed to use arrays instead of constantly duplicated code
 2020-08-10 23:38:32 -04:00
SteelT
0ec506127e Remove duplicate fadeScreen 2020-08-10 23:19:58 -04:00
Sally Coolatta
b1112b489c i guess this function was renamed?? 2020-08-10 22:16:01 -04:00
Sally Coolatta
39550596f9 A few more fixes to d_clisrv.c 2020-08-10 21:50:08 -04:00
Sally Coolatta
c96bd5f64a Many removals 
Lots of NiGHTS code, lots of ringslinger code, revert actnum behavior back to vanilla
 2020-08-10 21:45:51 -04:00
Sally Coolatta
a442b6a4f6 Fix up D_SRB2Main 2020-08-10 21:11:46 -04:00
Sally Coolatta
76241bb26b D_AddFile fixes 2020-08-10 20:35:17 -04:00
Sally Coolatta
60d7c7a7e4 Titlecard prototypes 2020-08-10 20:18:47 -04:00
Sally Coolatta
9a5f6f2dcd Vanilla level title draw functions 2020-08-10 20:12:02 -04:00
Sally Coolatta
a8a88c9e53 This string got really mad at me for this 2020-08-10 20:09:40 -04:00
Sally Coolatta
7ac6723e46 gamecontrol has another index for player num, instead of being duplicated for players 2-4 2020-08-10 20:08:32 -04:00
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