Sally Coolatta
|
5a6263c36b
|
Make it past p_mobj
|
2020-08-14 20:48:06 -04:00 |
|
Jaime Passos
|
c5cda018ea
|
Cache the console patch only once in CON_DrawBackpic
|
2020-08-14 20:48:15 -03:00 |
|
Jaime Passos
|
1e99f94de5
|
Fix cv_glshearing 2 in first person
|
2020-08-14 20:31:30 -03:00 |
|
James R
|
b426ed81dd
|
dumbass doesn't test changes before pushing directly to next
(cherry picked from commit be14b8a564a89a5afb84ac19f1586f3db7f68367)
|
2020-08-14 08:27:25 -07:00 |
|
James R
|
39da55bce3
|
dumbass doesn't test changes before pushing directly to next
|
2020-08-14 08:25:12 -07:00 |
|
Sally Coolatta
|
bc868d8c60
|
m_misc compiles
|
2020-08-14 06:32:03 -04:00 |
|
Sally Coolatta
|
c09e54d073
|
m_menu compiles
|
2020-08-14 06:28:35 -04:00 |
|
James R
|
67fbce8532
|
Autocomplete aliases in console
|
2020-08-14 00:00:45 -07:00 |
|
Sally Coolatta
|
2f2e813e52
|
m_anigif, m_cheat, m_cond, m_fixed
Up to m_menu, and it's screaming, so I'm going to take a break :V
|
2020-08-14 01:31:37 -04:00 |
|
Sally Coolatta
|
1500d682d2
|
hu_stuff & y_inter
|
2020-08-14 01:06:55 -04:00 |
|
James R
|
7be58ca3ee
|
Use AsciiChar to get the input from windows console window
|
2020-08-13 21:57:36 -07:00 |
|
James R
|
74af607d0c
|
Stop treating apostrophes, parenthesis and curly braces as separate arguments
|
2020-08-13 21:11:45 -07:00 |
|
Louis-Antoine
|
8471f9e71f
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into resend-gamestate
# Conflicts:
# src/d_clisrv.c
# src/d_clisrv.h
# src/d_net.c
# src/p_saveg.c
# src/p_saveg.h
|
2020-08-13 13:53:10 +02:00 |
|
Sally Coolatta
|
6ef0af4ba5
|
g_game and g_input now compile
|
2020-08-13 00:05:44 -04:00 |
|
Sally Coolatta
|
9a21b3a46b
|
g_demo compiles
|
2020-08-12 23:08:31 -04:00 |
|
Sally Coolatta
|
5319ef434e
|
Compiling reaches g_demo.c again after the merge
|
2020-08-12 22:40:15 -04:00 |
|
Sally Coolatta
|
1c9284fbad
|
Remove functions no longer needed with skincolors[]
|
2020-08-12 20:59:30 -04:00 |
|
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 |
|
bartuinceQR
|
384bf7d059
|
chain homing
|
2020-08-12 22:49:41 +03: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 |
|