mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-19 09:42:21 +00:00
Merge main into fix/earthquake-click-details
Resolves conflicts with main: a world focus target's own range past its framed radius replaces the kind's range (#1832), so a quake asks for its own range only past M6 and the earthquake framing stays its floor; FIRMS keeps main's marker stand-in under the card-on-top rule; launches keep main's label click and also read the card on top through the pick registry.
This commit is contained in:
commit
e87aa5190d
1337 files changed
+38638
-9950
No files matched your search
@@ -39,6 +39,8 @@ const COCKPIT_REFUSALS = Object.freeze({
|
||||
cyclone: msg('Exit cockpit to fly to a cyclone'),
|
||||
// The News panel's cards and the news layer's hotspots fly to the event.
|
||||
news: msg('Exit cockpit to fly to a news report'),
|
||||
// A covered city's marker on Bike Share flies down into the city.
|
||||
'bike share': msg('Exit cockpit to fly to a bike share city'),
|
||||
// Voice track_entity (TRACKABLE_FAMILIES kinds in gevActions.js) and
|
||||
// frame_overhead, which frames the contacts around the current view.
|
||||
aircraft: msg('Exit cockpit to fly to an aircraft'),
|
||||
|
||||
Reference in new issue
Block a user