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

15904 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sally Coolatta
ac29aa86b0 Merge branch 'the-scary-22-merge' of https://git.magicalgirl.moe/KartKrew/Kart into the-scary-22-merge 2020-08-16 03:45:51 -04:00
Sally Coolatta
3a94a2db44 enum for the different face icon types 2020-08-16 03:45:09 -04:00
James R
a566a8e245 Revert "Disable animated textures" 
This reverts commit 5e13555727.
 2020-08-16 00:10:49 -07:00
Sally Coolatta
9863171879 Remove MF_BOUNCE, use MF_SLIDEME to enable P_SlideMove for an object 2020-08-16 03:03:04 -04:00
Sally Coolatta
8fd64ca607 Fix ring usage & gravity 2020-08-16 02:12:17 -04:00
Sally Coolatta
51aef1ce75 Fix some of the dehacked tables, change doomednums of haunted heights stuff to not conflict with items/waypoints, use "rings" variable instead of "kartstuff[k_rings]" 2020-08-16 01:46:54 -04:00
James R
36885c1343 Merge remote-tracking branch 'origin/the-scary-22-merge' into the-scary-22-merge 2020-08-15 21:35:17 -07:00
James R
6cd395f1ff Even the warning can die, give the programmer some credit 
(cherry picked from commit 6d67b7c3269d2530cfcd7a93cfde401e09d04138)
(cherry picked from commit 390042ffc5)
 2020-08-15 21:34:05 -07:00
James R
b1fb9ed737 Fix more compiler errors 2020-08-15 21:32:02 -07:00
Sally Coolatta
a251c3909b Lots of little fixes 
Gameplay seems to work (besides the addplayer & client config stuff), but visuals (mostly sprites, but a little bit of HUD) are really messed up
 2020-08-16 00:29:04 -04:00
James R
246e71a463 Is it GCC is it gcc, is it???? 2020-08-15 21:29:02 -07:00
Sally Coolatta
5e13555727 Disable animated textures 2020-08-16 00:16:17 -04:00
Sally Coolatta
49e2f98beb TEMPORARY: Revert Got_AddPlayer and disable D_SendPlayerConfig 
Bare minimum for levels to load again, need to figure out why the 2.2 merged version isn't working
 2020-08-16 00:15:05 -04:00
Sally Coolatta
a2caa2dc16 Character select can open without crashing 2020-08-15 22:40:49 -04:00
Sally Coolatta
ae4ea9eda2 Fix sound effects 2020-08-15 22:29:55 -04:00
Sally Coolatta
30144d5d06 Things to get it to run 
Build is still MASSIVELY broken, you can't even get into a level, still investigating
 2020-08-15 20:09:36 -04:00
Sally Coolatta
172ffea590 update srb2win.rc, D_ConvertVersionNumbers uses kart's 2 number style instead of vanilla's 3 number style 2020-08-15 11:54:50 -04:00
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