thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-02 14:12:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
16703 commits 2 branches 14 tags 206 MiB
Commit graph

16703 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sally Coolatta
e6a9e5a68e Merge branch 'master' into new-menus 2020-11-08 02:49:28 -05:00
Sal
d79c719ad9 Merge branch 'plane-sorting-fix' into 'master' 
Fix sprite against FOF plane sorting

See merge request KartKrew/Kart!328
 2020-11-03 13:06:49 -05:00
James R
0d6f329b1d Do not sort sprite in front of plane if plane should render in front of sprite's plane 
Say you have a higher plane in the foreground and a lower one behind. And then
insert a sprite above the plane in the background, the top of which is higher
than the height in the foreground. Should the sprite be drawn in front of the
foreground plane? I think not. Sprites drawing in front of a plane if only part
of them is above the plane is a rendering trick that allows sprites to extend
into the floor. This doesn't make sense if the plane they extend into would be
obscured anyway, or if they don't extend into the plane at all.
 2020-11-02 17:54:51 -08:00
James R
263a11e62f Remove unused stuff 2020-11-02 03:37:16 -08:00
James R
9abdb855f9 Check that top of sprite is above plane or bottom is below 
This fixes slightly raised fofs drawing on top of sprites that should be in
front of them. Previously would check that the bottom of the object was above
the plane. Now also uses sprite offsets like the fof seg sorting does.
 2020-11-02 03:37:00 -08:00
Sally Coolatta
601451bead This RNG thing was removed, so it doesn't need to be in demo code anymore either 2020-10-31 02:39:30 -04:00
James R
c609dffdab Stupid P_MapStart crash because of flicky teleport before map load 2020-10-28 22:35:31 -07:00
Sal
1aef75bff3 Merge branch 'model-texture-fix' into 'master' 
Model texture fix

Closes #97 and #100

See merge request KartKrew/Kart!325
 2020-10-28 16:31:19 -04:00
Sally Coolatta
01d5c9a95b Put back in the improvements to HWR_CreateBlendedTexture 
Fixes colors being darker, and creates blend textures faster
 2020-10-28 16:20:11 -04:00
Sally Coolatta
bac7de9b0f Merge branch 'master' into model-texture-fix 2020-10-28 15:58:00 -04:00
Sal
a0621b92f9 Merge branch 'anchors-on-slopes' into 'master' 
Offset slope anchors from regular slopes

See merge request KartKrew/Kart!319
 2020-10-28 15:50:30 -04:00
Sal
8b20a94202 Merge branch 'additive-transmap' into 'master' 
Additive and Subtractive Translation Maps

See merge request KartKrew/Kart!323
 2020-10-28 15:50:22 -04:00
Sally Coolatta
a253a6cedd Remove rogue line making this function do nothing 2020-10-28 15:41:32 -04:00
Sally Coolatta
646fd15b02 Remove these 2 calls to HWR_UnlockCachedPatch 
From what I can tell, this is not in SRB2 master or next. I'm uncertain about this, but Jeck has had zero crashes with this.
 2020-10-28 15:16:05 -04:00
James R
faefe23d88 Merge branch 'music-changes' into 'master' 
Load multiple musicdef, use music.pk3

See merge request KartKrew/Kart!324
 2020-10-28 01:16:49 -04:00
James R
f5329f25bf Use music.pk3 2020-10-27 17:20:57 -07:00
James R
7199bba3b2 Update musicdef conversion utility 2020-10-27 15:51:36 -07:00
James R
d896fee2e5 Load multiple musicdef lumps from a single wad 2020-10-27 15:45:10 -07:00
James R
e7051737d7 Use 2.2's musicdef parser 2020-10-27 15:00:31 -07:00
James R
de936f4c7f Don't reset drift off springs 
Hopefully nothing requires drift reset from here.
 2020-10-26 20:49:39 -07:00
James R
d19c96ee17 Revert step down changes 2020-10-26 20:20:04 -07:00
James R
2ae394b8e3 Fix opengl splitscreen 2020-10-26 19:51:42 -07:00
Sal
96a5eadc84 Merge branch 'the-scary-22-merge' into 'master' 
The scary 22 merge

Closes #19, #80, #69, #94, #61, #64, #6, #27, #46, #47, #45, #43, #37, and #72

See merge request KartKrew/Kart!321
 2020-10-26 22:21:01 -04:00
James R
9bff8c2ecb Remove the other -splitscreen parameter 2020-10-26 19:03:24 -07:00
James R
eec54356c3 Fix splitscreen fov being fucked on first R_ExecuteSetViewSize 2020-10-26 18:57:32 -07:00
James R
65cc5f52f2 Fix doubling the volume 2020-10-26 04:23:29 -07:00
Sryder
01a37668bc Add missing MFD_TRANSSUB to dehacked 2020-10-26 11:22:27 +00:00
James R
b21a0a8cf2 Fix module and chip music being SRB2 LOUD 2020-10-26 04:19:41 -07:00
Sryder
11386e12ba Keep NUMTRANSMAPS what it was, instead add NUMEFFECTMAPS to end of enum 
Should have easier merging and be less likely to break current effects.
 2020-10-26 11:18:53 +00:00
Sryder
a585d3c9d1 Revert "Fix various things that used NUMTRANSMAPS for the number of translucent trans maps" 
This reverts commit dc453fbbda.
 2020-10-26 11:07:17 +00:00
James R
364b69c621 Let turn while light snaking 2020-10-26 03:46:49 -07:00
James R
88a8a09516 Make sneaker panels push you in spinout AGAIN LOL 
The old condition for player movement was...

1. player hasn't finished
2. player not in pain, or player in pain but on the ground

The else condition to this is therefore player has finished or player in pain
and in the air.

I believe K_MomentumToFacing (prior to bots) was only for letting the player
turn around after crossing the finish line, to face the camera.

(K_MomentumToFacing also does nothing in the air.)
 2020-10-26 02:05:14 -07:00
James R
e5a9bfc968 Fix conflicting step up/down code 2020-10-25 17:04:06 -07:00
Sryder
69f32bfcaf Merge branch 'the-scary-22-merge' of git@git.do.srb2.org:KartKrew/Kart.git into additive-transmap 2020-10-25 23:19:38 +00:00
Sryder
dc453fbbda Fix various things that used NUMTRANSMAPS for the number of translucent trans maps 2020-10-25 23:19:20 +00:00
James R
2c35034960 Fix invincibility music not ending 2020-10-25 13:43:44 -07:00
Sal
00c83dfcf9 Merge branch 'loading-screen' into 'the-scary-22-merge' 
Loading bar for startup

See merge request KartKrew/Kart!322
 2020-10-25 13:53:28 -04:00
Sally Coolatta
79a319ec02 Add a "title screen" 2020-10-25 11:34:58 -04:00
Sally Coolatta
c93330bf20 Use enum for better maintainability & error checking 2020-10-25 11:34:15 -04:00
Sally Coolatta
3469ab12ba Add extra warning for CON_STARTUP_LOADSTEPS being incorrect 2020-10-25 10:48:32 -04:00
Sryder
488ad70da3 Merge branch 'the-scary-22-merge' of git@git.do.srb2.org:KartKrew/Kart.git into additive-transmap 2020-10-25 14:43:44 +00:00
Sally Coolatta
12f56d64a7 Adds a simple white loading bar at the bottom of startup, instead of covering the cool reference with text 
Mockup of what it looks like, since the window's invisble when you try to print-scr it: https://cdn.discordapp.com/attachments/275750804227489794/769931098636943391/unknown.png
 2020-10-25 10:35:24 -04:00
Sally Coolatta
f121ed210a Fix flashing tics 2020-10-25 09:57:51 -04:00
Sally Coolatta
afbbfc9b1f Fix cvars 
My wrist burns...
 2020-10-24 21:32:07 -04:00
Sally Coolatta
7c2bd0d1c2 Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
Sally Coolatta
ddf466d61f Fix compile errors 2020-10-24 19:52:09 -04:00
Sally Coolatta
9b6aa946ea Merge remote-tracking branch 'srb2/master' into the-scary-22-merge 2020-10-24 19:28:06 -04:00
Sryder
b16a16027d Fix additive/subtractive walls not working when sectors have multiple lights in OpenGL 
This is a change that could have broken other areas so should be checked too for other areas
 2020-10-25 00:27:28 +01:00
Sally Coolatta
15cfafaeba Merge remote-tracking branch 'public/master' into the-scary-22-merge 2020-10-24 18:38:27 -04:00
Sally Coolatta
fda698a290 Merge master 2020-10-24 18:34:07 -04:00