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

1881 commits

Author SHA1 Message Date
Nev3r
860c44d953 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 
# Conflicts:
#	src/lua_hooklib.c
 2020-04-12 09:57:19 +02:00
Sally Cochenour
fafdb257b8 Actually, this should be left alone too 2020-04-02 15:15:34 -04:00
Sally Cochenour
3ae0cd03fb Scale waypoint radius with mapobjectscale 
Fixes Marble Garden's bots
 2020-04-02 15:15:00 -04:00
Sally Cochenour
29613dba90 Merge branch 'master' into pet-robo 2020-03-31 10:47:03 -04:00
Sally Cochenour
69a67376b3 Oni's suggestions 
- Only look for players who can pick up the item. Serves as a subtle tell for other players holding onto items, and lets you see the canon color more often
- Held eggman item uses black instead of player color
- Fix karma items not animating
 2020-03-30 07:43:22 -04:00
Sally Cochenour
266ad99374 Add new item sprites 2020-03-30 06:57:42 -04:00
Sally Cochenour
9e2c119b56 Merge branch 'master' into pet-robo 2020-03-29 20:44:13 -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
e5ae9d1513 Merge branch 'master' into pet-robo 2020-03-28 08:43:40 -04:00
Sally Cochenour
bee6bbf619 Firework frames for fire shield 2020-03-28 03:56:39 -04:00
Sally Cochenour
657a15fae2 Merge branch 'master' into new-items 2020-03-28 00:23:39 -04:00
Sally Cochenour
2ca00cf2e9 Try to prevent bubble from going out of bounds 2020-03-28 00:21:41 -04:00
Sally Cochenour
751fd9ad1b Start on bots, doesn't work 2020-03-27 23:51:49 -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
Latapostrophe
6d0513aa9a Fix conflict 2020-03-25 23:31:53 +01:00
Sal
8d763afae6 Merge branch 'map-features' into 'master' 
Minor but handy new mapping features

See merge request KartKrew/Kart!218
 2020-03-23 00:44:18 -04:00
James R
abcba53781 Merge remote-tracking branch 'origin/master' into parties 2020-03-22 18:28:07 -07:00
Sally Cochenour
25bc236bde Merge branch 'master' into new-items 2020-03-22 20:50:28 -04: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
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
Sally Cochenour
7f1d55421a Merge branch 'master' into new-items 2020-03-22 14:23:51 -04:00
Sally Cochenour
eddfc38d6e Merge branch 'master' into map-features 2020-03-22 12:54:53 -04:00
Louis-Antoine
29294a53cc Encapsulate plane height checks 2020-03-22 17:28:50 +01:00
Sal
36f9bb4381 Merge branch 'waypoints' into 'master' 
Waypoints Exist

See merge request KartKrew/Kart!215
 2020-03-22 01:05:02 -04:00
Sally Cochenour
c75e3a025c Braces to avoid compile error 
(Not sure why I never got this until now?)
 2020-03-21 23:11:19 -04:00
Sryder
9dae62c2c6 Fix me being hyperdumb with copypaste error 2020-03-22 00:47:02 +00:00
Sryder
203aa0602e Use P_FindSpecialLineFromTag for MT_WAYPOINT, now that it works where we need it 
This matches how MT_SPINMACEPOINT was changed
 2020-03-22 00:25:48 +00:00
James R
310a9cd09c Merge remote-tracking branch 'origin/master' into parties 2020-03-21 17:22:57 -07:00
Sally Cochenour
22702f88bc "Delete items" sector type 2020-03-21 19:54:24 -04:00
Sryder
da2f1fc972 Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints 
# Conflicts:
#	src/k_kart.c
 2020-03-21 23:27:55 +00:00
Sally Cochenour
58df481cd3 Replace "Block Enemies" with "Block Players" 
We don't need the ability to make invisible walls for enemies as often as we've needed invisible walls for players that don't block their thrown items.
 2020-03-21 19:08:59 -04:00
James R
fd1cb69a87 Merge remote-tracking branch 'origin/master' into parties 2020-03-21 12:45:23 -07:00
MascaraSnake
9b76d3af6f Merge branch 'next' into udmf-next 
# Conflicts:
#	extras/conf/Includes/SRB222_linedefs.cfg
#	extras/conf/Includes/SRB222_misc.cfg
#	src/p_spec.c
 2020-03-21 20:04:31 +01:00
Latapostrophe
366fff9942 Red rings, fuse, and spb game speed support 2020-03-20 21:58:14 +01:00
Louis-Antoine
4e7605f0e2 Make SRB2 flat like Earth 2020-03-20 18:55:29 +01:00
Louis-Antoine
46df2b9551 Use HAVE_BLUA as fuel for my fireplace 2020-03-19 18:36:14 +01:00
Sally Cochenour
bb516042a8 Correct shadow size 2020-03-17 21:02:44 -04:00
Sally Cochenour
c313de326e Teleport bubble trap overlay after slowing down rather than before 2020-03-17 20:47:05 -04:00
Sally Cochenour
040865b589 Merge branch 'master' into new-items 2020-03-17 19:31:47 -04:00
Sally Cochenour
eb2c36348e Bubble Shield trap overlay fixes 
- Add player momentum to it, so that it lines up better
- Set noclip so it doesn't stop against walls
 2020-03-17 19:27:09 -04:00
Sally Cochenour
48e69f7c91 Air sparks, start on drift boosts 2020-03-16 00:53:33 -04:00
Sally Cochenour
4174d9a23e Add a function for retrieving drift spark color, to simplify a lot of code & add transition colors to everything 2020-03-15 23:02:43 -04:00
Sally Cochenour
fa34e4eee4 Merge branch 'master' into sal-waypoints 2020-03-15 20:21:17 -04:00
Sally Cochenour
084901a8b1 Add warnings for old map setups 
We probably don't want to keep these for release, but we need reminders to get rid of them ourselves :V
 2020-03-15 19:21:06 -04:00