1
0
Fork 0
Commit graph

9084 commits

Author SHA1 Message Date
Julian Smith
4c70e25c1b keyboard.xml: alt-c toggles /sim/animation-tooltips.
For use with associated simgear change that adds auto-generated tooltips for
all moving objects.
2019-08-31 14:14:18 +01:00
Julian Smith
e41c0f099b Nasal/canvas/tooltip.nas: handle multiple properties.
Allows sprintf string to contain multiple %'s, which are mapped to multiple
<property>...</property> tags.
2019-08-31 14:14:18 +01:00
Julian Smith
c280ff3fc4 Nasal/prop_key_handler.nas: fixed couple of issues in search ('?') code.
Don't include initial '/' in search string.

Don't fail if a property value is -Nan.
2019-08-31 14:14:18 +01:00
Julian Smith
96fd272a51 Nasal/prop_key_handler.nas: added new '#' command to listen to properties.
Sets up listeners to show all changes to specified property or any of its child
properties.
2019-08-31 14:13:31 +01:00
Delta Echo
16086cac2d [Nasal]Add possibility to recognise drag robots for glider towing 2019-08-31 10:20:15 +02:00
Delta Echo
24553feb57 Fix duplicate material name as pointed out by Scott 2019-08-30 09:45:53 +02:00
Delta Echo
4ecc3ce909 Merge branch 'next' of https://git.code.sf.net/p/flightgear/fgdata into next 2019-08-29 09:50:33 +02:00
Julian Smith
8301a4f16e Nasal/view.nas: allow Tower View Look From to work with multiplayer aircraft. 2019-08-29 00:11:52 +01:00
Julian Smith
2c5f6a96c2 Nasal/view.nas: Implemented multiplayer fly-by view. 2019-08-29 00:11:52 +01:00
Julian Smith
7550ff70d9 Nasal/view.nas: set new property /sim/current-view/multiplayer to 0 or 1.
Useful to have this information available as a simple property.
2019-08-29 00:11:51 +01:00
Julian Smith
48911a8131 Nasal/gui.nas: nextStyle(): popup new GUI style's name.
Also added delta param to control direction of change.
2019-08-29 00:11:51 +01:00
Julian Smith
2d8ec16afc Nasal/multiplayer.nas: improved font handling in Pilot List dialog.
It looks like widgets don't inherit font or colour from parent widgets. Also,
setting font=nil gives sublety different results compared to leaving font
unspecified.

So we now set font and colour explicitly for every widget using new function
set_default().

Also set font and colour of 'Pilots:' widgets and heading widget to me.fg[1] to
match other text.
2019-08-29 00:11:51 +01:00
Julian Smith
0f741b16fe Nasal/multiplayer.nas: disable 'no model installed' messages. 2019-08-29 00:11:51 +01:00
Julian Smith
c4d71f06e0 Nasal/multiplayer.nas: remove hard-coded default font params.
These are unnecessary because we use gui/styles/*. This also allows an empty
style to be specified, where we inherit from system-wide defaults.
2019-08-29 00:11:51 +01:00
Julian Smith
a651665368 gui/styles/anthrax.xml: fix <style-name> => <name>. 2019-08-29 00:11:51 +01:00
legoboyvdlp R
fc7319a5da Local weather: correct the fade in rate per private discussion with Thorsten, this will in the short term reduce jumps until I figure out changing this per distance; this was originally meant to be over 10 seconds apparently 2019-08-27 20:56:32 +01:00
Stuart Buchanan
4784a929d7 Instance based random buildings
Replace random buildings with one using proper instancing.
Also implement more control over rendering of random buildings.
see README.scenery for details.
2019-08-20 17:02:27 +01:00
Delta Echo
55ef7e007e Merge branch 'next' of https://git.code.sf.net/p/flightgear/fgdata into next 2019-08-14 09:14:43 +02:00
Julian Smith
81fc15d8e7 Nasal/view.nas: fix for regression in handling of /sim/current-view/?-offset-m.
resetViewPos(): set /sim/current-view/?-offset-m to
/sim/view[]/config/?-offset-m, not zeros.

This requires corresponding change to flightgear to compensate for the extra
offset, and fixes things when aircraft implement custom views by writing to
/sim/current-view/?-offset-m.
2019-08-12 18:02:02 +01:00
Julian Smith
ff503c1093 Nasal/multiplayer.nas: in Pilot List, append +/- to altitude if ascending or descending. 2019-08-12 18:02:02 +01:00
Julian Smith
4e94cdc906 Nasal/multiplayer.nas: in Pilot List, added column showing id of nearest airport.
Requires changes to flightgear to populate
/ai/models/multiplayer[]/sim/tower/airport-id.
2019-08-11 13:22:59 +01:00
Delta Echo
e0a315a2ed Merge branch 'next' of https://git.code.sf.net/p/flightgear/fgdata into next 2019-08-07 19:37:26 +02:00
Julian Smith
f591120032 Disabled old 'Model View' selector by default.
It is now called 'Legacy multiplayer view selector', and enabled/disabled via
new checkbox in the 'View - View Options' dialogue.
2019-08-05 07:31:47 +01:00
Julian Smith
2e5e314a77 Nasal/view.nas:stepView(): also create /sim/current-view/view-number-raw.
This allows new view code to find the view configuration with non-sequential
view numbers (e.g. on 777).
2019-08-05 07:31:47 +01:00
Julian Smith
a10274665d Nasal/view.nas: pilot_view_limiter: protect against nil. 2019-08-05 07:31:47 +01:00
Delta Echo
41b1561b9d Merge branch 'next' of ssh://git.code.sf.net/u/deltaecho/flightgear_fgdata into next 2019-07-30 07:43:30 +02:00
Delta Echo
b305eae6f8 Add support for more linear airport features 2019-07-29 15:46:57 +02:00
Richard Harrison
294e76a47f Revert "Nasal/screen.nas: move log window to top-left and left-align the text."
It's always been at the top; and although it is clear that the intent of this change was to improve things it highlights the need to make more substantial improvements to the way on screen messages are handled.

What we probably should have is an area that has a transparent dark background, a fixed size, supports scrolling, can be left open (or re-opened) and moved persitently around the screen.

This reverts commit 82f3eb45b9.
2019-07-29 13:00:23 +02:00
James Turner
0a68cbd93a Merge /u/jsb1685/fgdata/ branch next into next
https://sourceforge.net/p/flightgear/fgdata/merge-requests/151/
2019-07-22 15:54:56 +00:00
Henning Stahlke
aaa7888f6b add setViewByIndex to view.nas 2019-07-21 12:56:01 +02:00
Julian Smith
c80059ba53 Removed Model View so that Tower View AGL doesn't alter view numbers.
Due to Nasal/view.nas making a sequential copy of views, inserting new view
number 8 for Tower View AGL broke custom views, e.g. for aircraft 777).

We no longer require Model View (it's identical to Helicopter view now), so
this way we can have Tower View AGL without altering sequential view numbers.
2019-07-20 22:01:05 +01:00
Julian Smith
3738d84d7b Nasal/view.nas: set /sim/viewp[]/config/root to point to multiplayer data.root.
This is required by view code.
2019-07-09 16:25:11 +01:00
Julian Smith
f61b097eb3 Nasal/multiplayer.nas: In Pilots list, use only one colour (white) for pilots for whom we have a model.
I think the previous alternating colours were confusing because of the use of
a third and fourth colour for when we have no model or are using a fallback
model.
2019-07-09 16:25:11 +01:00
Julian Smith
82f3eb45b9 Nasal/screen.nas: move log window to top-left and left-align the text.
Reduces chat messages etc obscuring HUD.
2019-07-09 16:25:11 +01:00
Julian Smith
e2df25343a Nasal/multiplayer.nas: reordered columns in Pilot List window.
Moved 'code', 'ver' and 'set' away to the right, as i think they are less
important. Also demoted 'brg' a little and promoted 'dist-'.
2019-07-09 16:25:11 +01:00
Julian Smith
4f260baf43 Aircraft/c172p/Models/Effects/: fix path for Aircraft/c172p/Models/Effects/exterior/dirt.png.
Avoids warnings like: Texture file not found: 'Models/Effects/exterior/dirt.png'
2019-07-09 16:25:11 +01:00
Julian Smith
47415e20ce Pilot List dialogue now allows control of which aircraft to view.
I think this is more convenient than the normal model-view buttons / popup
list. [Though this is still there.]

Nasal/multiplayer.nas:
    Added new column 'view' with checkbox. Also added 'view self' button to
    titlebar to view the user's aircraft.

    Fix some bad indentation.

Nasal/view.nas:
    Changed /sim/current-view/model-view to contain just the callsign, not
    '<callsign> <model>', so that Nasal/multiplayer.nas can get the callsign
    reliably.
2019-07-09 16:25:11 +01:00
Julian Smith
72e2aa8c1e gui/dialogs/pilot_offset.xml: in 'Adjust View Position', added 'Zero' buttons. 2019-07-09 16:25:11 +01:00
Julian Smith
944cddcb49 gui/dialogs/model-view-select.xml: move list to left to line up with <> buttons. 2019-07-09 16:25:11 +01:00
Julian Smith
56859113b2 Nasal/multiplayer.nas: added column showing whether we've found and loaded -set.xml for each multiplayer.
This determines whether multiplayer views work correctly - these require
correct view offsets from the -set.xml files.
2019-07-09 16:25:11 +01:00
Julian Smith
9822b8ff8c Added multiplayer support to Helicopter View and Tower View etc.
We remember the multiplayer aircraft so that when switching between views,
multiplayer views (currently Helicopter, Model, Tower and Tower AGL) show the
same aircraft.

Nasal/view.nas: use /orientation/true-heading-deg in Model view and Tower AGL
view. This avoids problem when looking at multiplayer aircraft because there is
no /ai/models/multiplayer[]/orientation/heading-deg

Nasal/view.nas: improved handling of sim/current-view/{x,y,z}-offset-m. Changed
resetViewPos() to set these all to zero, because view's offsets are now
kept separate. Also removed setting of /sim/current-view/z-offset-m to
chase-distance - this is the wrong place now that views define the offset
explicitly.

Also added Tower View AGL support.
2019-07-09 16:25:11 +01:00
Scott Giese
9d7cbc1810 [asia] Terrain/deciduous-hires_mask.png does not exist 2019-07-04 13:58:42 -05:00
Yves Tolosa-Joas
2cd245a0db Traffic update for Lufthansa, Lufthansa CityLine and some AirDolomiti by Marcin 2019-06-30 15:14:01 +01:00
Stuart Buchanan
018a7c4afa Further c172p fixes.
Manual merge of cf5dd13f83
2019-06-24 19:38:58 +01:00
James Turner
20bcc16032 Route-manager: guard against a procedure failure
When we have a STAR which is invalid for the selected runway, which
can occur when switching runway/approach, don’t cause a Nasal runtime
error.
2019-06-24 16:41:45 +01:00
James Turner
52373760e2 Canvas Map: tolerate empty paths in waypoints
This fixes bogus indexing warnings and thus Nasal failures when
processing certain kinds of FlightPlan leg, such as discontinuities
and skipped legs.
2019-06-24 16:39:51 +01:00
Stuart Buchanan
cea9d242dd Fix c172p warning messages
Manual merge of cf5dd13f83
2019-06-21 14:54:06 +01:00
Stuart Buchanan
b079fffa13 Updated c172p with 8.33kHz radio stack
https://github.com/c172p-team/c172p/commits/release/2019.1

184e0083293de474c7944b34b8ac71c5e12380fc
2019-06-18 21:31:13 +01:00
Richard Harrison
7c914b4ade Added default settings for new Nasal background GC.
* /sim/nasal-gc-threaded (true) - use background threaded GC
* /sim/nasal-gc-threaded-wait (false) - at the start of the frame wait for the previous GC thread to complete.
2019-06-11 14:41:13 +02:00
Richard Harrison
88ff80737f Tanker compatibility for models with unspecified refuel offsets.
Ensure that the offset properties are created and fix a nilptr reference
2019-06-11 14:41:12 +02:00