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

207 commits

Author SHA1 Message Date
Monster Iestyn
24f14fc526 Merge branch 'master' into fof-slope-skew-backport 
# Conflicts:
#	src/r_segs.c
 2018-11-23 22:40:28 +00:00
Alam Arias
5fd6df3625 Merge pull request #326 from monster-psychic-cat/opengl_splitscreen_sky_fix 
Render the skies correctly on splitscreen in OpenGL mode
 2018-11-23 14:48:05 -05:00
toaster
5fe9cbba3d Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_again 
# Conflicts:
#	src/d_clisrv.c
#	src/m_misc.c
 2018-11-18 18:26:50 +00:00
Alam Ed Arias
45c8920bb1 Clean up warnings 2018-11-14 10:52:16 -05:00
Sryder
9350721d12 Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge 
# Conflicts:
#	src/d_main.c
#	src/d_main.h
#	src/d_netcmd.c
#	src/doomtype.h
#	src/hardware/hw_md2.h
#	src/p_user.c
#	src/r_splats.h
#	src/s_sound.c
#	src/s_sound.h
#	src/screen.c
#	src/sdl/i_system.c
 2018-11-10 21:14:53 +00:00
MPC
1fcf3c8863 Render the skies correctly on splitscreen in OpenGL mode 2018-11-10 16:19:41 -03:00
toaster
4281f59971 Merge branch 'fof-slope-skew-backport' of https://git.magicalgirl.moe/STJr/SRB2.git 2018-11-10 18:27:13 +00:00
Monster Iestyn
58c8cbf71d Whoops, this broke my non-NEWCLIP test build 2018-11-10 16:10:25 +00:00
Monster Iestyn
210ea25a1b Made some efforts to improve efficiency of new code, hard to tell if I've made it better or worse though honestly 
R_IsEmptyLine is now a thing too btw
 2018-11-10 16:09:21 +00:00
Monster Iestyn
ad860e0d01 More progress, NEWCLIP added to doomdef.h, sadly it actually all lags the game so I've disabled it for now 
Other notes:
* on second thought I'll keep the hw_clip functions' gld prefixes rather than HWR, not like it matters either way
* despite the extra lag it does fix the issues with translucent walls and such when displayed at different vertical angles, such as with the GFZ1 waterfall
 2018-11-10 16:08:56 +00:00
Monster Iestyn
ee590fb9ae Remove pointless drawtextured variable and redundant fake planes checks (R_FakeFlat would already have made gr_frontsector/backsector something else if they were) 2018-10-27 19:32:55 +01:00
Monster Iestyn
e32d4ead6a Added missing checks in HWR_AddLine from the software version, move v** vars to the top since R_PointToAngle calls use the same values anyway 2018-10-27 19:31:24 +01:00
Monster Iestyn
ef2b789bfe Make new pv1/pv2 seg pointers, so AdjustSeg doesn't modify the v1/v2 pointers directly anymore 
Yes I know they're void * in r_defs.h's seg_t definition, it's quicker than trying to figure out if including hardware/hw_glob.h is a good idea or not
 2018-10-27 19:29:31 +01:00
toaster
6469956d6a Final weather stuff. 
* Multiplied rain speed by 3, per Oni's request.
* Disable weather density - force to 1 if weather draw distance, otherwise zero
* Move the ceilingpic check into a more convenient part of the weather spawning loop.
* `drawdist_precip_cons_t` - replaces "Infinite" with "None".
* Disable the lowest normal draw distance (256), given... both kart and srb2 are basically unplayable like that.
* Disable cv_drawdist_nights entirely.
 2018-10-14 22:32:34 +01:00
toaster
1142fddc71 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain 
# Conflicts:
#	src/d_netcmd.c
#	src/d_netcmd.h
#	src/g_game.c
#	src/p_floor.c
#	src/p_user.c
#	src/r_data.c
#	src/r_data.h
#	src/v_video.c
 2018-10-14 21:52:05 +01:00
Monster Iestyn
6fb3dcb52f Remove unused sscount variable 
(it's only set to 0 in software, and only ++'d in OpenGL, what kind of sense does that make?)
 2018-10-11 19:59:26 +01:00
Sal
2f43e56774 Merge branch 'noclip-cam' into 'master' 
Noclip cam

See merge request KartKrew/Kart!32
 2018-10-07 23:15:06 -04:00
toaster
2ad2cbcc0a Weather is already run client-side. What if we ran it render-side, for major performance gains? This commit will answer all your questions - and more! 2018-10-07 15:00:58 +01:00
TehRealSalt
f026615dfe Don't need thissec 2018-10-06 23:37:27 -04:00
TehRealSalt
d8cf9327a6 OGL support 2018-10-06 19:25:59 -04:00
Monster Iestyn
57f76051bd Redo OpenGL skewing support, so that it now itself supports the lower unpegged effect for FOFs in OpenGL! 2018-09-28 17:02:02 +01:00
toaster
880037c2e3 Revamp flat alignment to be consistent across all renderer functions except for the software slope renderer, which me and fickle tried our best at but couldn't get to work. (This is a backport of 2.2 code that slightly postdates the improved flat alignment Kart's had for a while.) 
This fixes #11.
 2018-09-27 18:11:43 +01:00
toaster
9ab42d91cb Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into encore 
# Conflicts:
#	src/info.c
#	src/m_menu.c
#	src/y_inter.c
 2018-09-21 20:54:38 +01:00
toaster
1e57004fad Partially address Sal's review last night by switching to a more sensible default. I'm still unconvinced on the need to make encore mode a seperate knob on the grounds of overcomplexity and "you can't turn map hell off", but hopefully this'll be a shippable state we can come back to later. 
Also, thank you for reminding me, Sryder - disable my very, very limited progress on encore mode in openGL so that stages aren't an unintended hodgepodge of different colourschemes for the objects versus the level environment.
 2018-09-21 12:12:17 +01:00
toaster
b87feaeceb Animated sky backport 2018-09-17 11:21:25 +01:00
TehRealSalt
2f7563a5b0 Ignore texture on horizon lines when in OGL 
Before: https://cdn.discordapp.com/attachments/300531341957529602/484842910475354124/kart0110.png
After: https://cdn.discordapp.com/attachments/270211093761097728/484841628771680258/kart0109.png

Not a solution, but better than the previous.
 2018-08-30 17:53:25 -04:00
toaster
a291659b12 Merge branch 'sonicitems' into encore 2018-08-08 12:04:17 +01:00
toaster
62ae9d5d64 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into sonicitems 
# Conflicts:
#	src/f_finale.c
#	src/hardware/hw_md2.c
 2018-08-07 21:20:27 +01:00
toaster
d582a9dd97 Encore mode - a fresh take on mirror mode! 
* Palette remaps.
* Branding.

TODO:
* Doesn't work in GL. (Mostly.) I have SOME ideas on how to tackle this, but...
* Transmaps are broken in Encore for some reason.
* I tried to make in-level colormaps shimmy over, but it didn't quite work, so I commented it out and only semi-fixed it.
 2018-07-23 23:50:41 +01:00
Monster Iestyn
1e4e0006cb Merge branch 'opengl-fof-lowerunpegged' into 'master' 
OpenGL: FOF walls + Lower unpegged

See merge request STJr/SRB2!258
 2018-07-11 16:36:26 -04:00
TehRealSalt
997c1bebe1 Merge branch 'master' into sonicitems 2018-07-08 17:51:44 -04:00
TehRealSalt
9f08890866 The remaining errors on a GCC 6.3 setup 2018-07-07 16:38:54 -04:00
SeventhSentinel
24a4ee1133 Fixed a bit of redundancy, pointed out by Sryder 2018-06-26 18:04:07 -04:00
SeventhSentinel
aff72749c5 Extend mobj->colorized to work on... well, mobjs 
Previously would only work on players. Now karma items should be easier to spot as intended!
 2018-06-26 16:46:47 -04:00
Monster Iestyn
e3616de7de Fix OpenGL completely missing the ability to alter FOF wall pegging by lower unpegged flag. Stupid OpenGL. 
Sorry in advance Lat'!
 2018-06-26 21:41:05 +01:00
Monster Iestyn
609cc16b1e Fix HWR_ProjectSprite to check properly whether the displayed player's mobj or its subsector exists, to avoid a crash when checking for fake planes. (also use viewplayer since its available to use, silly hardware code) 
Also tweaked a weird splitscreen check in HWR_DrawSpriteShadow; still investigating whether stplyr is ever not player 2 when it's player 2's view, but this looks better for now
 2018-06-23 18:47:32 +01:00
TehRealSalt
8c748120b7 MFE_DRAWONLYFORPx stuff ported to OpenGL, and MT_DRIFTDUST respects Boo powers 2018-06-11 02:15:27 -04:00
TehRealSalt
a041efde6c Merge branch 'master' into sonicitems 2018-06-09 22:50:21 -04:00
Sryder
963c4ae96b Merge branch 'public_flatsprite' of git@git.magicalgirl.moe:Sryder/SRB2.git 
# Conflicts:
#	src/hardware/hw_main.c
 2018-06-09 23:43:25 +01:00
Sryder
ca4da92470 Fix papersprites more for real this time 
(Seperate AL and AR sprites were broken, I figured out I was a dunce, oh noey)
 2018-06-09 22:58:03 +01:00
Sryder
52c41fb550 Fix the issue from the merge 2018-06-09 22:25:00 +01:00
Sryder
f1a4042d55 Merge branch 'public_flatsprite' of git@git.magicalgirl.moe:STJr/SRB2.git 
# Conflicts:
#	src/hardware/hw_main.c
 2018-06-09 21:01:59 +01:00
Sryder
41cb51159d Merge branch 'next' into public_flatsprite 
I also fix papersprites in regards to flipping on one sprite fits all rotation stuff

# Conflicts:
#	src/hardware/hw_main.c
 2018-06-09 18:47:42 +01:00
TehRealSalt
5d8fbba2a1 Fixes 2018-06-08 00:02:28 -04:00
TehRealSalt
ec23771ef7 Merge remote-tracking branch 'srb2public/next' 2018-06-04 16:58:35 -04:00
Monster Iestyn
892bed87d9 Merge branch 'opengl-bigmap-fix' into 'master' 
OpenGL: Very large map rendering issue fixed

See merge request STJr/SRB2!249
 2018-06-03 15:08:10 -04:00
Sryder
51606f675f Very large map rendering issue fixed 
Move old fix for too large maps having rendering issues from R_CheckBBox to OpenGL's HWR_CheckBBox
From what I know, this effects at least Aerial Garden and Seraphic Skylands
 2018-05-26 13:13:37 +01:00
Sryder
85aff6fa6b Fix FF_FULLBRIGHT not working in sectors with multiple light levels in OpenGL 2018-05-16 21:04:57 +01:00
TehRealSalt
8fe068ef46 Merge remote-tracking branch 'refs/remotes/srb2public/next' 
# Conflicts:
#	src/f_finale.c
#	src/hardware/hw_draw.c
#	src/hardware/hw_main.c
#	src/m_misc.c
 2018-04-07 18:43:59 -04:00
Sryder
347651ffb1 Uncomment HWR_CorrectSWTricks but set gr_correcttricks to be off by default 
I wasn't aware of the cvar, this should do for now since I don't believe any maps use these software tricks, probably an old leftover from DOOM.
 2018-03-30 23:12:44 +01:00