Sally Coolatta
c321ae77fb
Fix deployer defaults
2020-08-15 11:29:53 -04:00
Sally Coolatta
22b6181244
Update version.h
2020-08-15 10:17:21 -04:00
Sryder
91a81cd6ee
Merge branch 'the-scary-22-merge' of git@git.magicalgirl.moe:KartKrew/Kart.git into the-scary-22-merge
2020-08-15 14:51:55 +01:00
Sryder
b84fe5212e
Makefile was linking i_thread.o twice
2020-08-15 14:51:40 +01:00
Sally Coolatta
e0e506ec55
Ran through a different compiler, fixing the minor warnings it had
2020-08-15 09:32:10 -04:00
Sally Coolatta
631f698432
Cleanup
...
So for whatever reason it's still giving me a warning about functions in i_threads having duplicate definitions, even though they clearly do not.
I'm completely stumped so I'm just gonna mess with my compile setup....... in the mean time, if anyone else could try to compile it, I'd appreciate it, so we know if it's just my end or if its something else
2020-08-15 08:32:56 -04:00
Sally Coolatta
0dc21106e5
Lua stuff is done
2020-08-15 07:47:18 -04:00
Sally Coolatta
19016db338
Got through OGL
2020-08-15 06:20:22 -04:00
Sally Coolatta
f12501dfb6
SDL files
2020-08-15 06:02:39 -04:00
Sally Coolatta
9efdc98de6
Makes it through all kart files
...
All that's left is SDL, OGL, maybe also Lua
2020-08-15 04:42:56 -04:00
Sally Coolatta
fd5fe916bc
Get past w_wad.o
2020-08-15 03:31:23 -04:00
Sally Coolatta
7d095060cf
Makes it past s_sound.o and sounds.o
2020-08-15 02:15:08 -04:00
Sally Coolatta
873474ac87
Make it to s_sound
2020-08-15 01:54:45 -04:00
Sally Coolatta
dfd733eb80
Up to screen.o
...
Lots of renderer files I didn't need to touch at all here :)
2020-08-15 00:55:30 -04:00
Sally Coolatta
9b9ab8a2d5
Get up to p_user
2020-08-14 23:23:14 -04:00
Sally Coolatta
5a98c00405
NOW we make it past p_mobj
2020-08-14 22:28:49 -04:00
Sally Coolatta
9c51086348
Update K_KartMoveAnimation to use new spr2 states
2020-08-14 21:42:06 -04:00
Sally Coolatta
c665393bd0
actaully I was incorrect, it didn't make it past it. Now it makes it TO it at least :V
2020-08-14 21:21:17 -04:00
Sally Coolatta
5a6263c36b
Make it past p_mobj
2020-08-14 20:48:06 -04: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
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
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
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