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

712 commits

Author SHA1 Message Date
Latapostrophe
fbd10d0e6c Fix a bruh moment where I deleted follower from relinkpointers when fixing a conflict and it broke every netgame :oh: 2020-06-10 22:52:32 +02:00
Latapostrophe
cab9c2a139 Merge branch 'v2-master' into followme-internal 2020-06-07 23:56:32 +02:00
Hannu Hanhi
6961bba693 Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge 2020-06-07 20:01:05 +03:00
Latapostrophe
6ac63cca7a Merge branch 'v2-master' into followme-internal 2020-06-02 22:21:16 +02:00
lachwright
92cae7aef9 Oops, forgot to #undef 2020-05-31 01:26:23 +08:00
lachwright
3b4df4657a Move drop shadows to the ceiling for objects in reverse gravity 2020-05-31 01:21:26 +08:00
Sally Coolatta
63917ffccc The start of the scary 2.2 merge 
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
 2020-05-29 13:43:38 -04:00
Sally Coolatta
20b2dabae9 Merge branch 'pet-robo' into grand-pricks 2020-05-25 12:44:59 -04:00
Monster Iestyn
58d62f9881 also do the fovtan multiplication thing with precip sprites 2020-05-20 19:34:18 +01:00
Monster Iestyn
8ad59bbb51 on second thought maybe we don't need extra tx clamping, it turns out to be more effort than it's worth (at least for now) 
meanwhile, let's move x/yscale calculations down since we don't actually need them until later on
 2020-05-19 22:00:34 +01:00
Monster Iestyn
4ad02cae93 change limits for tx based on fov, by multiplying by fovtan 
this makes it so that higher fov values can actually let you see all the sprites that should be in the view
 2020-05-19 18:54:39 +01:00
Monster Iestyn
a2a6208548 do tx checking after tz clamping, not before 2020-05-19 18:43:33 +01:00
Monster Iestyn
b1f804871f We don't actually need x1 or x2 until these points in the function, at least for papersprites 2020-05-19 17:23:22 +01:00
Monster Iestyn
c9d2a79ecc added basic culling of papersprites if tx for either is too large, proper clamping to be added later 
also removed some commented out old code
 2020-05-19 17:19:44 +01:00
Monster Iestyn
f496001c8b split "rot" into two variables: frame and rot, for frame number and rotation angle 
it always bothered me that "rot" was used for both of the above, since it confused me as to what it was for every time I look at this function
 2020-05-19 16:58:53 +01:00
Monster Iestyn
a361437f77 remove gxt and gyt, as they are unnecessary 
also add a few comments to explain what tx/tz are
 2020-05-19 16:48:50 +01:00
Sal
843721cc8f Merge branch 'sprite-offsets' into 'master' 
Sprite offsets for horizontal springs

See merge request KartKrew/Kart!265
 2020-05-18 14:39:09 -04:00
Louis-Antoine
74fa35221d Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into slope-cleanup 
# Conflicts:
#	src/hardware/hw_main.c
#	src/p_spec.c
 2020-05-18 16:14:05 +02:00
Louis-Antoine
6af2871fa5 Rename P_GetZAt to P_GetSlopeZAt and P_GetZAt2 to P_GetZAt 2020-05-18 15:23:56 +02:00
Sally Coolatta
719d4702c1 Merge branch 'master' into sprite-offsets 2020-05-15 23:00:30 -04:00
Jaime Passos
668b9bc684 Fix missing sprite column 2020-05-15 16:17:31 -03:00
Jaime Passos
c69a4f9ced Merge remote-tracking branch 'origin/next' into pictureformats 2020-05-15 01:34:54 -03:00
Sally Coolatta
249fff87ad Merge branch 'new-cars-movie' into colorize-tweak 2020-05-12 22:46:46 -04:00
Sally Coolatta
63797b35f7 Merge branch 'pet-robo' into grand-pricks 2020-05-12 22:40:02 -04:00
Sally Coolatta
15d18640de Merge remote-tracking branch 'public/master' into merge-12 2020-05-12 03:16:14 -04:00
Sally Coolatta
b4f5d931cc Skincolor code cleanup 
Split everything off into its own file and turn SETBRIGHTNESS from a define into a function (K_ColorRelativeLuminance).
 2020-05-11 02:28:25 -04:00
Latapostrophe
2bee969c6a Add follower bubbles with the BUBBLESCALE field 2020-05-11 00:16:13 +02:00
Sally Coolatta
22afa68651 Rivals system 
You can input a predetermined list of rivals for each character, up to 3. In S_SKIN: `rivals = sonic,tails,knuckles`. Can support skin names from addons without throwing warnings.
 2020-05-09 21:55:50 -04:00
Sally Coolatta
f210b4a417 Sprite offset code 2020-05-08 19:38:51 -04:00
Monster Iestyn
c06fbf4fe7 Merge branch 'master' into next 2020-05-06 21:51:36 +01:00
Latapostrophe
a8e642b394 Accidentally put this check in the wrong place 2020-05-04 21:19:28 +02:00
Latapostrophe
766f7f035f Let followers change colour separatly from players 2020-05-04 18:08:41 +02:00
Hannu Hanhi
1350b89a06 More render stats for software mode, renamed and relocated some render stats variables 2020-05-02 23:13:53 +03:00
Monster Iestyn
145b7d8f66 Fix drop shadow and rotsprite code to use SHORT() 2020-05-02 17:13:16 +01:00
MascaraSnake
8efec04051 Remove POLYOBJECTS and POLYOBJECTS_PLANES defines 2020-05-02 12:08:31 +02:00
Monster Iestyn
e78a2fa297 Merge branch 'master' into next 2020-04-23 18:49:53 +01:00
Wolfy
5e4ec61d82 Merge remote-tracking branch 'remotes/bird/isolatedbatching' into awful-mix 
# Conflicts:
#	src/hardware/hw_cache.c
#	src/hardware/hw_draw.c
#	src/hardware/hw_glob.h
#	src/hardware/hw_main.c
#	src/r_bsp.h
#	src/r_data.c
 2020-04-11 23:47:25 -05:00
James R
f68a361f6e Merge branch 'pk3-directory-start' into 'next' 
Don't skip the first directory entry of PK3 if it's a file

See merge request STJr/SRB2!764
 2020-04-09 19:49:44 -04:00
Latapostrophe
4c1459cd4e Chaos Conflicts 2020-03-29 12:14:27 +02:00
toaster
c74dde0f0f Minor optimisations surrounding R_DrawFlippedMaskedColumn. 
* Replace the texheight parameter provided directly to it with a previously existing (now renamed) global used for the same purpose, so that it can be used as an interchangeable function pointer with R_DrawMaskedColumn.
* Using the above, optimise R_DrawVisSprite to call a function pointer in a tighter loop rather than check SC_VFLIP each time around.
* SHORT macro can involve repeated operations; calculate once and put in memory for both RANGECHECK and papersprite.
* Remove irrelevant range check (already covered by existing range check immediately above) from R_DrawFlippedMaskedColumn and R_DrawMaskedColumn.
* "Warning: avoiding a crash in %s %d" is a terrible error message, and it chips away at the tightness of the loop just for something most people will never see printed. Replace with a PARANOIA I_Error in case someone actively wants to go hunting for its cause.
 2020-03-26 16:09:19 +00:00
Louis-Antoine
29294a53cc Encapsulate plane height checks 2020-03-22 17:28:50 +01:00
James R
310a9cd09c Merge remote-tracking branch 'origin/master' into parties 2020-03-21 17:22:57 -07:00
Louis-Antoine
4e7605f0e2 Make SRB2 flat like Earth 2020-03-20 18:55:29 +01:00
Monster Iestyn
d35464204e Set the "spritename" variable within R_AddSingleSpriteDef rather than externally to it, since R_InstallSpriteLump is the only place it gets used anyway 
This way we don't have to make it some extern in order for r_skins.c to use it
 2020-03-08 19:51:18 +00:00
Monster Iestyn
a12833ccd2 remove r_skins.c include in r_things.c, on second thoughts 2020-03-08 19:36:56 +00:00
Monster Iestyn
9013398151 Create r_skins.c/.h, to contain skins code formerly in r_things.c/h 2020-03-08 19:32:07 +00:00
Sally Cochenour
7174b707a1 Draw distance uses object scale 2020-03-08 00:39:21 -05:00
Jaime Passos
81a57d5fac Merge remote-tracking branch 'origin/next' into pictureformats 2020-03-07 20:43:16 -03:00
James R
18aa2972e5 Merge remote-tracking branch 'origin/master' into parties-only 2020-03-05 21:41:23 -08:00
James R
253ab49c07 Merge remote-tracking branch 'origin/master' into 22shadows 2020-03-05 21:36:58 -08:00