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

14505 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sally Cochenour
7690eeab2b Merge branch 'new-items-blah' into new-items 2020-03-22 20:51:16 -04:00
Sally Cochenour
25bc236bde Merge branch 'master' into new-items 2020-03-22 20:50:28 -04:00
Sally Cochenour
a638054332 Bad whoopsie 2020-03-22 20:37:20 -04:00
Sal
82a39f6c85 Merge branch 'kill-whitespace' into 'master' 
Kill CRLF and trailing whitespace

See merge request KartKrew/Kart!216
 2020-03-22 20:31:08 -04:00
Sal
d64f77cf06 Merge branch 'welcome-to-errormode' into 'master' 
abs on unsigned does nothing

See merge request KartKrew/Kart!220
 2020-03-22 20:30:47 -04:00
Sal
fe9927fbd8 Merge branch 'targets' into 'master' 
Break the Capsules

See merge request KartKrew/Kart!172
 2020-03-22 20:30:20 -04:00
Sally Cochenour
53df47b4fe toaster suggestions 2020-03-22 20:29:58 -04:00
Sally Cochenour
013aa22c16 Minor item calculation fixes 2020-03-22 17:53:11 -04:00
Monster Iestyn
1677aff989 Merge branch 'demos-refactor' into 'next' 
Demos refactor

See merge request STJr/SRB2!853
 2020-03-22 17:52:45 -04:00
James R
c74cea6d5d abs on unsigned does nothing 2020-03-22 14:47:12 -07:00
James R
0ee7456708 Fix shit 2020-03-22 14:45:21 -07:00
James R
2491efed20 EXTERN 2020-03-22 14:39:16 -07:00
James R
dda610fbd4 Merge remote-tracking branch 'origin/master' into kill-whitespace 2020-03-22 14:36:21 -07:00
James R
cbd4693de7 Merge remote-tracking branch 'origin/master' into parties 2020-03-22 14:34:29 -07:00
Monster Iestyn
0a288260fc Merge branch 'buggle-trouble' into 'next' 
P_HomingAttack related fixes

See merge request STJr/SRB2!836
 2020-03-22 16:57:22 -04:00
Monster Iestyn
0a360e1d90 Merge branch 'fix-setspriteinfo' into 'next' 
Fix lib_setSpriteInfo indexes being off-by-one

See merge request STJr/SRB2!854
 2020-03-22 16:40:34 -04:00
Sally Cochenour
7f07fa9b2d Move item box counter stuff into k_battle 2020-03-22 16:23:56 -04:00
Sally Cochenour
198b9770f7 Apply to any break the capsules, instead of only time attack 2020-03-22 16:14:53 -04:00
Sally Cochenour
8d91ff1e1c No time limit in capsules 2020-03-22 16:13:41 -04:00
Sally Cochenour
b18df427dd Break the Capsules ends when you lose bumpers 2020-03-22 16:07:25 -04:00
Sally Cochenour
601ab839f0 Set bumpers to 1 in Break the Capsules 2020-03-22 14:55:47 -04:00
Sally Cochenour
b1ec5654bc Merge branch 'master' into targets 2020-03-22 14:31:17 -04:00
Sal
6e02982e7d Merge branch 'air-spark-experiment' into 'master' 
Air spark experiment

See merge request KartKrew/Kart!217
 2020-03-22 14:26:33 -04:00
Sally Cochenour
7f1d55421a Merge branch 'master' into new-items 2020-03-22 14:23:51 -04:00
Sal
7ce109249a Merge branch 'antigrav-waypoints' into 'master' 
Fix antigrav respawn, no respawn flag, and remove spinout when respawning

See merge request KartKrew/Kart!213
 2020-03-22 14:23:21 -04:00
fickleheart
09c2e4fe26 Split horizon lines for minimal distortion 2020-03-22 12:52:17 -05:00
fickleheart
6749cb89b5 Distort far edges to viewz for a flat horizon line 2020-03-22 12:28:49 -05:00
fickleheart
3bf609e819 GL horizon lines 2020-03-22 12:13:59 -05:00
Sally Cochenour
1c7c972e08 Merge branch 'master' into power-level-tweak 2020-03-22 12:55:45 -04:00
Sally Cochenour
eddfc38d6e Merge branch 'master' into map-features 2020-03-22 12:54:53 -04:00
Louis-Antoine
39fae7fc06 Remove redundant conditional in P_IsClimbingValid 2020-03-22 17:45:07 +01:00
Louis-Antoine
2f5d3311f5 Cleanup P_IsClimbingValid 2020-03-22 17:39:51 +01:00
Louis-Antoine
f6cbf71df2 Remove unused define 2020-03-22 17:29:15 +01:00
Louis-Antoine
29294a53cc Encapsulate plane height checks 2020-03-22 17:28:50 +01:00
Louis-Antoine
3cf315f6da Fix typo in camera handling code 2020-03-22 15:21:23 +01:00
Latapostrophe
dc5284ecd0 Merge branch 'fix-double-bombs' into awful-mix 2020-03-22 13:09:06 +01:00
Latapostrophe
2cd0e1d615 I'm dumb, don't check for flashtics here... 2020-03-22 13:08:46 +01:00
MascaraSnake
5aee7a27eb Merge branch 'master' into next 2020-03-22 12:55:56 +01:00
MascaraSnake
331e906548 Add arrow to wall spike in ZB config 2020-03-22 12:55:34 +01:00
Latapostrophe
80e04a2035 Use proper respawn check, don't cancel spinout, but prevent dropdashing when respawning with spinout 2020-03-22 11:32:55 +01:00
MascaraSnake
93587d393d Merge branch 'master' into next 2020-03-22 07:51:35 +01:00
MascaraSnake
5edec462a3 Minor ZB config fix 2020-03-22 07:50:57 +01:00
James R
5e671b3483 Don't reset special music in P_RestoreMusic 
Because that resets Grow music when you stack Grow over Invincibility, and
Invincibility ends. (Also Megamix Themes.)

Thanks Snu, for calling P_RestoreMusic every tic!
 2020-03-21 22:34:27 -07:00
James R
7e0aa16e70 Reset Invincibility (and Grow) music to the start if stacked 
Toggleable via the resetspecialmusic cvar.
 2020-03-21 22:28:55 -07:00
James R
dd1715aa15 Optionally only resync Invincibility and Grow music 2020-03-21 22:28:55 -07:00
James R
d99d1994da Let invincibility and grow music fades work again 2020-03-21 22:28:55 -07:00
James R
3ae147b01b Revert "Menu option for music resync" 
This reverts commit a210874ae421007d0bc97b827b4e52c9b076cd90.
 2020-03-21 22:28:55 -07:00
James R
e6eac8cd3d Revert "More intuitive menu for music resync option" 
This reverts commit ee78597a42b4e5edf5b22466682b9a00da6bcecf.
 2020-03-21 22:28:55 -07:00
James R
80c7cc3c87 3 AM Moment: The death fades now only apply to local players 2020-03-21 22:28:55 -07:00
James R
15e8291903 Reset the music fade in cvar pointer too 
This fixes a bug with death fades.
 2020-03-21 22:28:55 -07:00