lachwright
f796379198
Reset pmomz after transfer to momz
2020-05-05 00:27:53 +08:00
Sally Coolatta
48ba151d98
Rather than showing random added skins, show random other players in the server on the signpost!
2020-05-03 20:58:12 -04:00
Sally Cochenour
e941749f4c
Move all of the item destroy sector code to one place
2020-04-15 22:45: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
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
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
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
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
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
Latapostrophe
366fff9942
Red rings, fuse, and spb game speed support
2020-03-20 21:58: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
Sally Cochenour
c6f3ac651e
Switch red & blue sparks, add yellow sparks, add big spark sprites
2020-03-14 01:43:54 -04:00
Sally Cochenour
83c74af696
Fix bad master merge
2020-03-06 12:56:12 -05: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
Sal
b13ebd6d15
Merge branch 'special-sector-tweak' into 'master'
...
Fix step-up on stairs for other objects (Orbinaut VS Toxic Palace Stairs)
See merge request KartKrew/Kart!201
2020-03-06 00:10:35 -05:00
Sal
10fe9434f6
Merge branch 'blizzard' into 'master'
...
Weather system refactor, Blizzard weather type
See merge request KartKrew/Kart!200
2020-03-06 00:09:43 -05:00
Sally Cochenour
ff190b7a88
Fix unsigned/signed comparison
2020-03-03 17:05:04 -05:00
Sally Cochenour
18637b9eb2
2.2 shadow port
2020-03-01 22:12:50 -05:00
Sally Cochenour
7a3733d75c
More remenants
2020-03-01 17:37:10 -05:00
Sally Cochenour
30d391b6b2
FINISH removing the shadows...
2020-03-01 17:35:49 -05:00