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

195 commits

Author SHA1 Message Date
Sally Coolatta
9d7ec0ab8f Merge SRB2 next 
Probably doesn't compile yet, but I got rid of all of the conflicts for anyone who wants to take a stab at it.
 2021-02-27 05:18:36 -05:00
Sally Coolatta
d0ca3b78c1 Merge branch 'master' into battle-rethink 2020-11-18 17:49:06 -05:00
Sal
b2eb64ac09 Merge branch 'roll-and-tilt' into 'master' 
Roll & pitch replace modeltilt

See merge request KartKrew/Kart!326
 2020-11-17 20:03:48 -05:00
Sally Coolatta
56a20d05df Merge branch 'master' into battle-rethink 2020-11-11 00:11:18 -05:00
Sally Coolatta
470e399abe Merge master, add support for hitlag jitter in OpenGL 2020-11-08 01:56:27 -05:00
Jaime Passos
da0f2286e3 P_DeleteFloorSpriteSlope -> P_RemoveFloorSpriteSlope 2020-11-05 00:42:14 -03:00
James R
896b29f002 Replace special handling for picking up items from below with MF_PICKUPFROMBELOW 2020-11-01 22:33:42 -08:00
Sally Coolatta
91ed67bece Start on Chaos Emeralds 
Functional! However, you don't drop them yet.
 2020-11-01 23:44:54 -05:00
Sally Coolatta
9dd43d4e4e Remove modeltilt, use roll & pitch instead 
Broken currently, about half of the slopes you can go into have the wrong tilt
 2020-10-28 18:36:26 -04:00
Jaime Passos
cdc4a6d86e Implement blend modes 2020-10-27 00:03:41 -03:00
Sryder
b341cacb0a Subtractive translation map 2020-10-19 11:57:12 +01:00
Sryder
5558fb073a Basic additive transmap/blend support 
Can currently be used on sprites only
added to flames by default because it makes sense
 2020-10-18 19:10:19 +01:00
James R
3a4a687da0 Use height difference between front and backside of line when stepping down 
This should fix the janky falling off steep slopes and let you cling to them.
Because when falling off a sector the edge of the player must not intersect
the edge of the higher sector, it is trickier than step up. The height
difference at the line must be stored to be useful.
 2020-10-14 21:10:02 -07:00
Jaime Passos
9365c88dc2 Fix precipitation 2020-10-15 00:03:32 -03:00
Jaime Passos
d348ff079b Only create floor sprite slopes when needed, instead of always allocating them. 
Has to be done manually in Lua. Use P_CreateFloorSpriteSlope, and P_DeleteFloorSpriteSlope when done with it.
 2020-10-14 13:07:02 -03:00
Jaime Passos
96fa912bae Implement object-defined floor sprite slopes. 2020-10-14 00:57:13 -03:00
Jaime Passos
a6f2e8b9c6 Implement relative and absolute sprite offsets for objects (mobjs) 
Added RF_ABSOLUTEOFFSETS and RF_FLIPOFFSETS
 2020-10-13 12:57:36 -03:00
Jaime Passos
b4b4738c94 Changes to sprite rendering: 
- Added render flags (see r_defs.h)
- Implemented floor splats
- Drop shadow sprite rendering through render flags
 2020-10-12 00:13:22 -03:00
Sally Coolatta
3e446a167c Restructure how damage works in kart COMPLETELY 
Instead of doing its best to avoid P_DamageMobj, it embraces it, using the damagetype system to decide how the player takes damage. Overall less stupid.
 2020-08-19 00:55:36 -04: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
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
f9ca40e673 Merge branch 'master' into the-scary-22-merge 2020-08-12 20:59:09 -04:00
Sally Coolatta
2f9f1df768 Merge p_mobj.h 2020-08-10 14:37:56 -04:00
Sally Coolatta
e296e1309a YAY, round 2 2020-08-09 21:02:56 -04:00
Sally Coolatta
7accb3f8d2 Merge p_mobj.c/h 2020-08-08 15:22:29 -04:00
Nev3r
0bd31d8862 Fix mapthing spawn height scaling improperly with the object scale; only special offsets should scale now. 2020-07-30 09:45:58 +02:00
Sally Coolatta
1bec6945ee Ease hitlag vibration over time 2020-07-29 11:26:24 -04:00
Sally Coolatta
c9b17c456d Re-attempt at hitlag 
I remember when I tried to fix wolfs' branch I was having issues, but this ended up working pretty much fine? Don't remember why the old branch was messed up though (it was simply too old & not substantial enough to try and work off of imo)
 2020-07-29 09:30:29 -04:00
Nev3r
3d90a6aebe Merge branch 'udmf-next' into 'next' 
Merge udmf-next into next

See merge request STJr/SRB2!1075
 2020-07-28 14:03:59 -04:00
Sally Coolatta
ca6ccca594 Add drawflags to Lua 2020-07-20 17:33:13 -04:00
Sally Coolatta
643a63e1e6 Finish merge 2020-07-20 13:39:05 -04:00
Sally Coolatta
ef2579f2b3 Merge branch 'master' into draw-flags 2020-07-20 13:38:48 -04:00
GoldenTails
a913a8a652 Expose P_PlayerZMovement to Lua. 
Finishing off these changes; how a player moves vertically.
 2020-07-12 18:02:50 -05:00
GoldenTails
6124e010b2 Expose P_SceneryZMovement to Lua. 
Still more complex than P_RingZMovement.
 2020-07-12 18:02:50 -05:00
GoldenTails
93edc25cae Expose P_RingZMovement to Lua. 
Ever wanted to move like a ring vertically?
 2020-07-12 18:02:50 -05:00
GoldenTails
d0f9d79170 Expose P_ZMovement to Lua. 
Because P_XYMovement wasn't enough.
 2020-07-12 18:02:50 -05:00
GoldenTails
1fb799203c Expose P_SceneryXYMovement to Lua. 
Ironically this seems slightly more advanced than P_RingXYMovement...
 2020-07-12 18:02:50 -05:00
GoldenTails
0bbd08f980 Expose P_RingXYMovement to Lua. 
Ever wanted to move like a ring horizontally?
 2020-07-12 18:02:50 -05:00
Nev3r
6b38fe4b2c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-06 11:13:27 +02:00
kaysrishaq
6f859fd44d FF_HORIZONTALFLIP and mobj->mirrored (sprite enhancements) 2020-06-19 11:11:18 -04:00
MascaraSnake
3ce62d7780 Merge branch 'next' into udmf-next 
# Conflicts:
#	src/p_mobj.c
#	src/p_polyobj.c
 2020-06-09 09:38:01 +02: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
SwitchKaze
58cac1fd73 Make colors UINT16, increase color freeslots to 1024 2020-05-23 19:35:36 -05:00
Sally Coolatta
f210b4a417 Sprite offset code 2020-05-08 19:38:51 -04:00
MascaraSnake
d2e21afaf1 Merge branch 'next' into udmf-next 
# Conflicts:
#	src/p_mobj.c
#	src/r_segs.c
 2020-04-24 21:15:53 +02:00
sphere
7955c96fa1 Restore carelessly removed const keywords. 2020-04-22 23:38:10 +02:00
sphere
0868930d3b Make emerald hunt shards spawn at correct heights, and add Float option. 2020-04-22 18:58:40 +02:00
Nev3r
9eb5fe954d Add missed pitch and roll to precipmobj_t 2020-04-19 16:05:08 +02:00
Nev3r
da165d2d22 Add textmap pitch and roll parsing, and mobj pitch and roll variables. 2020-04-19 14:51:55 +02:00
Louis-Antoine
4e7605f0e2 Make SRB2 flat like Earth 2020-03-20 18:55:29 +01:00