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

543 commits

Author SHA1 Message Date
toaster
23faef24d7 * Introduce SPR2_XTRA for face graphics, since the current system is prone to plenty of conflicts with modders if you're not careful. 
* Fixed a bug where you'd see :nick: on the current character selection screen if you didn't have many skins loaded.
* Fixed a bug where character skins loaded in PK3s would attempt to load every single lump of the PK3, even if it wasn't in the same subfolder as the original S_SKIN, as a sprite into the player struct. Could stand to be ported to vanilla.

Requires new chars.kart, which was created using the help of the indev 2.2-based Kartmaker update which will be available shortly.
 2020-09-23 23:46:54 +01: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
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
0dc21106e5 Lua stuff is done 2020-08-15 07:47:18 -04:00
Sally Coolatta
5a6263c36b Make it past p_mobj 2020-08-14 20:48:06 -04:00
Sally Coolatta
5319ef434e Compiling reaches g_demo.c again after the merge 2020-08-12 22:40:15 -04:00
Sally Coolatta
f9ca40e673 Merge branch 'master' into the-scary-22-merge 2020-08-12 20:59:09 -04:00
Sally Coolatta
fc10bf1d9a Fix conflicting info definitions 2020-08-10 16:49:54 -04:00
Sally Coolatta
e296e1309a YAY, round 2 2020-08-09 21:02:56 -04:00
Sally Coolatta
cdb0310982 Merge info.c/h 2020-08-06 17:38:29 -04:00
James R
b23581ac38 The drift boost clip is fatter 2020-07-19 21:05:29 -07:00
James R
280791a832 Drift Boost Plumes, play every other frame of Drift Boost Explosion (normally flicker frames) 2020-07-19 19:11:19 -07:00
James R
f8b19a239f Drift Boost Clip, bounces on floor and sparks, then flickers until it dies 2020-07-19 18:04:11 -07:00
James R
1dae3d196b Who said anything about a 5th frame? 2020-07-18 14:52:30 -07:00
James R
59c0f99865 5th frame + rainbow colors cycle on the drift explody 2020-07-17 23:44:00 -07:00
Nev3r
6b38fe4b2c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-06 11:13:27 +02:00
LJ Sonic
325867ea59 Merge branch 'jetjawsound' into 'next' 
Jet Jaw Sounds

See merge request STJr/SRB2!1018
 2020-07-04 07:09:43 -04:00
LJ Sonic
ac070380c1 Merge branch 'cez3debris' into 'next' 
New Debris for CEZ3

See merge request STJr/SRB2!1012
 2020-07-04 07:00:20 -04:00
Nev3r
e301d268ec Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 
# Conflicts:
#	src/hardware/hw_main.c
 2020-06-30 20:29:48 +02:00
Zippy_Zolton
74ece42ee2 Jet Jaw Sounds 2020-06-25 00:38:07 -05:00
sphere
97ebb50e12 Give ACZ3 boss MF_NOCLIP(HEIGHT) when entering pinch phase, to prevent softlocking. 2020-06-21 16:01:24 +02:00
Zippy_Zolton
9c194f4186 Thanks for the feedback, I have fixed your issues. 2020-06-20 02:04:18 -05:00
Zippy_Zolton
50f51715a7 New Debris for CEZ3 2020-06-20 02:02:13 -05:00
Latapostrophe
f33e4d62a0 Sort conflicts, fix misordered follower bubble states in dehacked 2020-06-05 02:33:39 +02:00
Sryder
d13d923a92 New water trail for skimming 
Out with the old splish splish. Bring on the SKKKKSSSSSSS
 2020-06-04 01:47:56 +01:00
Sryder
0f9872fc27 Draw radius for waypoint debug on "best" waypoint. 
Fix scale of waypoint connections on mapmobjscale maps
 2020-06-03 20:26:52 +01:00
Latapostrophe
6ac63cca7a Merge branch 'v2-master' into followme-internal 2020-06-02 22:21:16 +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
Sally Coolatta
0282615c38 Merge branch 'master' into pet-robo 2020-05-18 15:18:37 -04:00
MascaraSnake
b068a37d14 Merge branch 'udmf-next' into udmf-polyobjects 
# Conflicts:
#	src/p_polyobj.c
 2020-05-16 11:18:47 +02:00
Sally Coolatta
0038241325 Merge branch 'master' into new-cars-movie 2020-05-12 22:41:37 -04:00
Sally Coolatta
1788d29263 Merge branch 'master' into pet-robo 2020-05-12 22:38:23 -04:00
Sally Coolatta
15d18640de Merge remote-tracking branch 'public/master' into merge-12 2020-05-12 03:16:14 -04:00
Latapostrophe
2bee969c6a Add follower bubbles with the BUBBLESCALE field 2020-05-11 00:16:13 +02:00
Sally Coolatta
9ea37836e2 New kart animations! 
- Add unique frames for inward and outward drifting.
- Increase the speed threshold required to reach your "fast driving" frames.
- Use slow driving frames when you're slowing down, even if you're techincally above the fast speed threshold.
- Use frameangle to smooth out the transition into drifting, instead of having "pre-turned" drift frames.
 2020-05-08 17:26:27 -04:00
lachwright
645c324d51 Update new GFZ3 laser 2020-05-06 09:03:03 +08:00
lachwright
b4648e4c78 New GFZ3 laser 2020-05-06 09:01:02 +08:00
MascaraSnake
db717f1cf7 Move polyobject crush option to the first line args 2020-05-04 23:27:26 +02:00
Latapostrophe
63485c3dbe Merge branch 'v2-master' into followme-internal 2020-05-03 22:37:26 +02:00
Sally Coolatta
1fcfdd5bae Bot hints 
Thing type 2004, adds a map-defined point for bots to gravitate towards or away from.
Angle: Changes radius, defaults to a 32 radius (or 64x64 area) without.
Ambush: When off, makes bots steer towards. When on, makes bots steer away.
Parameter: Changes how much the bot steers away/towards this point. If 0, defaults to 2.

(also, made bots ignore strong offroad if they could take a shortcut)
 2020-04-30 14:15:10 -04:00
James R
fd51bf10b0 Thing type 2003, MT_WAYPOINT_ANCHOR - Adjust waypoint's radius 
The distance from the waypoint to the anchor will be the new radius.
 2020-04-21 00:36:45 -07:00
James R
71f4433b98 Merge branch 'dye' into 'next' 
Expose colorization to mappers and SOC

See merge request STJr/SRB2!679
 2020-04-09 19:50:32 -04:00
James R
89a2f8ec8d Thing type 2002, MT_WAYPOINT_RISER - Raise tagged waypoints in sector to FOF sorted by height 
Thing height refers to the index of FOF. FOF are sorted by top height, lowest
to highest. Set Object Flip to sort highest to lowest.

If the waypoint thing set Object Flip, it will be placed on the bottom of the
FOF. The sorting remains the same though.

Set Ambush to raise the waypoint to the same z position.
 2020-04-04 01:20:38 -07:00
Sally Cochenour
266ad99374 Add new item sprites 2020-03-30 06:57:42 -04:00
Latapostrophe
4c1459cd4e Chaos Conflicts 2020-03-29 12:14:27 +02:00
Latapostrophe
8960152a7c Merge branch 'v2-master' into spb-waypoints 2020-03-28 15:12:38 +01:00
Sally Cochenour
bee6bbf619 Firework frames for fire shield 2020-03-28 03:56:39 -04:00
Sally Cochenour
d1580a5b42 More Flame Shield visuals 2020-03-26 08:48:02 -04:00
Sally Cochenour
7ec398e579 Slow down animation speed, fix meter bugs 2020-03-26 03:13:10 -04:00
Sally Cochenour
81fa5d7f51 Start on new flame shield dash visuals 2020-03-25 23:49:39 -04:00