1
0
Fork 0
Commit graph

1546 commits

Author SHA1 Message Date
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
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
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
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
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
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
Richard Harrison
a3a1ae01c8 Emesary: added optional overrun detection
- This will alert if any individual notifcation takes more than a certain amount of time to process.

Works well with the Emesary M_exec to identify where the slow parts of Nasal are.
2019-06-11 14:41:10 +02:00
Thorsten Renk
7ce5cd0267 Tentative improvements to semi-analytical model for orbital targets 2019-05-28 12:21:41 +03:00
James Turner
217417373b Merge /u/ltoenning/fgdata/ branch swift_connection into next
https://sourceforge.net/p/flightgear/fgdata/merge-requests/136/
2019-05-22 13:35:53 +00:00
Thorsten Renk
f23b74904b AW provides option to set a localized turbulence field around active volcano 2019-05-20 10:13:55 +03:00
Thorsten Renk
33e1404c51 Katla and Eyjafjallajokull volcano definitions 2019-05-20 10:07:46 +03:00
Henning Stahlke
6f4e7d91af canvas/api.nas add getSize() method 2019-05-05 23:19:37 +02:00
Henning Stahlke
406aa96ecf props.nas add createNodeObjectsFromHash() 2019-05-05 20:00:44 +02:00
Richard Harrison
2a748fdc70 Add thrust reverser to joystick bindings.
This can either be a button (which toggles) or an axis (variable)
2019-05-01 13:43:16 +02:00
Lars Toenning
f9cbb4f708 Adding dialog for swift connection 2019-05-01 13:20:48 +02:00
Torsten Dreyer
a48e7c7136 fix an old typo 2019-03-29 19:43:48 +01:00
Richard Harrison
6bbff8476e FGComm PTT - use selected channel
Only the selected channel will now be used for PTT; however the bindings still selected the appropriate channel prior to setting PTT.

This provides a compatible solution that can also easily be bound to the (joystick) controls.
2019-03-21 18:08:05 +01:00
Richard Harrison
480311eeef Comm PTT listeners; fix fault 2019-03-20 08:07:21 +01:00
Richard Harrison
4c6b103293 Add support for FGCom multiple radio support
PTT now in

/controls/radios/comm-ptt as an int; non zero indicates which comm radio to use

/comm-radio-selected is the default comm channel to use. This should usually be the same as will be set by PTT into /controls/radios/comm-ptt

NOTE: that PTT will switch the FG comm inbound and outbound frequency to whichever radio was PTT'd.
2019-03-19 21:16:33 +01:00
Stuart Buchanan
6b1db73423 FG1000 - Improved timers
Implement single timer for all highlighting of elements.
2019-03-12 20:33:35 +00:00
Thorsten Renk
4385b734f6 Orbital target simulation handles targeting APIs gracefully after save/resume 2019-03-11 12:55:35 +02:00
Richard Harrison
ec066a6b19 AAR Tanker: optimised property access. 2019-03-10 15:25:43 +01:00
Henning Stahlke
bdbd3848af comments, bugfixes and use API 2019-02-27 08:09:25 +00:00
Henning Stahlke
fb73705281 svg.nas fix transformation problems and use setClipByBoundingBox() from API 2019-02-27 08:09:16 +00:00
Henning Stahlke
74b0ef63c2 add resolveAlias() to props.nas 2019-02-12 18:35:10 +01:00
Stuart Buchanan
9d353a3266 FG1000: GFC700 Autopilot Integration
Support for GFC700 autopilot.  Current modes that work: AP, FD, ROL, PIT, HDG, VS
2019-02-10 22:06:31 +00:00
Henning Stahlke
801512bb8c add probe class to debug.nas 2019-01-31 22:41:35 +01:00
Henning Stahlke
9c9fb23f55 debug.nas add callback to breakpoint 2019-01-22 08:44:08 +01:00
James Turner
224ceaa546 Move the flap-quantisation code to its own file 2019-01-18 14:55:35 +00:00
Thorsten Renk
2e4193d3a1 Fix vector indices in inertial speed function of orbital target 2019-01-18 16:37:35 +02:00
James Turner
d9c13e9a81 Merge /u/jsb1685/fgdata/ branch next into next
https://sourceforge.net/p/flightgear/fgdata/merge-requests/127/
2019-01-16 10:08:25 +00:00
Thorsten Renk
59f0bfc5ca Update orbital target far zone simulatio to include leading J3 gravity effects 2019-01-14 13:47:29 +02:00
Henning Stahlke
79596cc6ab debug.nas add Breakpoint class 2019-01-13 22:09:54 +01:00
Henning Stahlke
72c4bde6e9 gui.nas use API functions 2019-01-13 21:03:32 +01:00
Henning Stahlke
9a4b898a27 svg.nas use setText method 2019-01-13 21:03:31 +01:00
Stuart Buchanan
f32a376a3e FG1000: EIS Fuel totalizer function
FG1000 requires fuel quantity to be entered manually and uses a flow
computer to calculate the amount used.  Strange but true!
2019-01-11 20:19:09 +00:00
Henning Stahlke
f8eb701d62 api.nas fix typos 2019-01-08 09:18:24 +00:00
Henning Stahlke
28183b7575 canvas/api.nas add setClipByBoundinbox and setClipByElement function 2019-01-07 18:00:08 +00:00
Stuart Buchanan
3b92497769 Joystick Config fixes from Ron HAERTEL 2019-01-06 20:48:47 +00:00
Henning Stahlke
7a1cb213dc Add-ons: minor changes to logging 2019-01-05 16:59:12 +01:00
Henning Stahlke
a91ebe4676 canvas/svg.nas add optional basic support for linked images
canvas/api.nas add alternative signature for ellipse and circle
2018-12-16 02:15:35 +01:00
Richard Harrison
07ac341b70 Fix timer usage
- didn't need to be a maketimer as it is a single shot usage.
2018-12-15 16:29:07 +01:00
Florent Rougon
02b01af19e Add-ons: small fixes to Nasal/addons.nas and Docs/README.add-ons
+ After discussion with Henning:
    - orig_setlistener() and orig_maketimer() were not intended to be
      public -> prefix the function names with an underscore;
    - clear the add-on's lists of tracked listeners and timers in
      remove() (load() does that too, but it's a bit late).

+ Little rewording in Docs/README.add-ons.
2018-12-10 15:29:22 +01:00
Henning Stahlke
f3548c561e canvas/api.nas: add square, ellipse and circle to path; update svg.nas accordingly 2018-12-08 19:55:08 +01:00
Henning Stahlke
f6e3628b50 add Window.getSize() to canvas/gui.nas 2018-12-08 16:55:38 +01:00
Henning Stahlke
5e2756b410 Add reload support to addons.nas; add tracking of listeners and timers 2018-12-07 19:24:22 +01:00
James Turner
e6fd70bd63 Merge /u/jsb1685/fgdata/ branch jsb-next into next
https://sourceforge.net/p/flightgear/fgdata/merge-requests/118/
2018-12-04 15:27:07 +00:00
Henning Stahlke
cce5b4ca1f canvas/gui.nas prevent runtime error 2018-12-04 14:47:20 +01:00
James Turner
6f26451c08 Merge /u/jsb1685/fgdata/ branch jsb-next into next
https://sourceforge.net/p/flightgear/fgdata/merge-requests/117/
2018-12-02 11:12:04 +00:00
Henning Stahlke
37adcd8051 canvas/svg.nas add support for circle und ellipse 2018-11-30 19:35:22 +01:00
James Turner
a5c8bbcc84 Rename nasal dir to avoid clashes 2018-11-28 22:49:45 +00:00
James Turner
d3a080ef29 Move GoFlight helpers to a subdir
Avoid loading the helpers by default
2018-11-19 17:17:35 +01:00
Richard Harrison
11ed499d61 /environment/contrail was always true for the first 30 seconds. Fixes #2077
Fix is to simply call the update method during the init listener.
2018-11-18 17:17:38 +01:00
James Turner
363dc4cea5 GoFlight MCP and EFIS input configs 2018-11-14 17:45:37 +00:00
Richard Harrison
8841f77cfd Emesary; handle fatal errors during a recipient receive.
- the recipient will be removed from the transmitter and appropriate error messages printed.

Contributed by Nikolai V. Chr.
2018-11-07 01:58:05 +01:00
Daniel Meissner
8e45e86f9c Fix glide slope tunnel altitude offset by moving it to correct runway touchdown zone. 2018-11-06 16:14:59 +01:00
Richard Harrison
c98c299625 Multiplayer list:
Change model that has a fallback model to be green rather than orange.
2018-11-05 19:52:41 +01:00
Richard Harrison
575a01aa9a GUI: change MP messages (other) craft to be a more readable coluor.
This is a compromise as it needs to be visible on dark and light backgrounds, however this colour seems to be about the best I can find.
2018-11-04 15:57:29 +01:00
Richard Harrison
6a68a623c9 Emesary: refactor incoming bridge connection logic
This is mainly to allow unit testing.
2018-10-31 10:05:34 +01:00
Thorsten Renk
73073c4512 Move AW auto-start detection outside AW namespace to avoid duplicate AW start issue when de-selected in launcher and selected in-sim 2018-10-06 09:41:22 +03:00
Scott Giese
43ac415a8a Bug Fix: #1732 Nasal runtime error with hovered tooltip 2018-10-03 01:49:50 -05:00
Richard Harrison
66c15d5b89 Canvas NavDisplay (map) fix nil waypoint when only one waypoint in flightplan.
Without this it will cause a nil dereference resulting in

Nasal runtime error: non-objects have no members
  at D:/Program Files/FlightGear 2018.2.2/data/Nasal/canvas/map/WPT.lcontroller, line 57
  called from: D:/Program Files/FlightGear 2018.2.2/data/Nasal/canvas/map/WPT.lcontroller, line 79
  called from: D:/Program Files/FlightGear 2018.2.2/data/Nasal/canvas/MapStructure.nas, line 1088
  called from: D:/Program Files/FlightGear 2018.2.2/data/Nasal/geo.nas, line 384
  called from: D:/Program Files/FlightGear 2018.2.2/data/Nasal/canvas/MapStructure.nas, line 1051
  called from: D:/Program Files/FlightGear 2018.2.2/data/Nasal/canvas/MapStructure.nas, line 1059
  called from: D:/Program Files/FlightGear 2018.2.2/data/Nasal/canvas/map/WPT.lcontroller, line 26
  called from: D:/Program Files/FlightGear 2018.2.2/data/Nasal/globals.nas, line 119
2018-09-29 13:41:01 +02:00
Thorsten Renk
4208e699cc AW: Teach AW about Default landclass 2018-09-17 11:39:35 +03:00
Richard Harrison
02643d36cd Controls: Remove debug prints 2018-09-16 20:41:43 +02:00
Richard Harrison
939887cca1 Joystick bindings: fix confusions over trigger and pickle.
Trigger sets /controls/armament/trigger - typically for a gun, but can be used (model side) to launch anything

Pick sets /controls/armament/pickle - typically to release something (e.g. missiles), but could be bound model side to act as a trigger.
2018-09-16 17:37:25 +02:00
Thorsten Renk
2e38b20030 New active volcano: Beerenberg on Jan Mayen 2018-09-15 10:32:58 +03:00
Richard Harrison
40ff13b65b Reposition slowdown settimer fixes.
Definitely problems in aar.nas, seaport.nas; as these were hanging off a fdm-initialized.

The others have timers that are started from a listener and as such are more suited to use maketimer rather than settimer

The modules that use the loopid technique are probably fine, but these are also more suited (and easier to understand) using a maketimer
2018-09-14 22:50:47 +02:00
Gijs de Rooy
41aaff7a89 Add lights shader to overall quality slider 2018-09-13 11:40:00 +02:00
Thorsten Renk
ab9805ca9b AW: Fix bad vertical visibility profile determination for high clouds in METAR 2018-09-05 09:27:44 +03:00
Richard Harrison
2e6d0725d1 Change the performance monitor to use the font as specified in the style (rather than hardcoding it) 2018-09-02 11:53:32 +02:00
Thorsten Renk
a91bb4caa0 Update canvas dialog widget lib 2018-09-01 09:49:16 +03:00
Thorsten Renk
67bb39d046 AW: Make weather system randomize the high cloud scattering properties on init to avoid repetition 2018-09-01 09:46:33 +03:00
Thorsten Renk
14cd479313 AW: Some tweaks for more consistent lighting of Cumulus cloud bottoms 2018-08-30 09:28:33 +03:00
Richard Harrison
70dd214ed8 Payload Dialog improvements;
- modify to work with JSBSim aircraft when reloading the fuel based on the payload (e.g. external tanks selected)
- add property sim/gui/dialogs/payload-reload that when set will cause the payload dialog to reload (to support a second dialog that modifies the payload)
- fix so that the window retains its position (close handler) and window Z order when reloading.
2018-08-07 19:26:25 +02:00
Richard Harrison
ee9f10cc03 Emesary: add new method and tidy up diagnostics. 2018-07-28 00:39:22 +02:00
Richard Harrison
2322d0dbe8 Joystick binding changes;
- added extra bindings
- reworked the view axis (usually bound to the hat); to move at a better rate.
- trim to elevator position. When selected this will remember the current position and when the joystick is centered it will apply this as the trim. Very useful for carrier approaches; and also it helps to do something that is much easier with loaded controls when you can feel the pressure being reduced by the operations of the trim switch
2018-07-28 00:39:22 +02:00
Richard Harrison
f8177dcc11 Changes to permit the (on demand) refuelling tanker to take part in replays. 2018-07-28 00:39:21 +02:00
Richard Harrison
04adc76265 Better support for numeric properties in PropertyUpdateManager 2018-07-28 00:39:21 +02:00
James Turner
bc00f8d436 Fix Nasal string.match with trailing *
As discussed in:
https://sourceforge.net/p/flightgear/codetickets/2016/

Fix a bug where string.match(‘747’, ‘747*’) returned false.
2018-06-16 20:53:07 +01:00
Richard Harrison
6431d36166 Generic MFD: Nav display optimisation
Change the NavDisplay so that the updates are paused when not being displayed.
2018-04-30 11:42:19 +02:00
Stuart Buchanan
8fdffa16e6 FG1000 - Fix 3D model GDUs, find nearest ID on DTO 2018-04-29 21:15:18 +01:00
Stuart Buchanan
aa14289a79 FG1000: NDB and VOR Info pages, improved VOR icons 2018-04-16 13:38:41 +01:00
Stuart Buchanan
63ee35becd FG1000 - Improvements to Checklists page, softkeys 2018-04-12 22:26:58 +01:00
Stuart Buchanan
9f7e17a434 Support for <group> of checklists.
Checklists now support grouping by placing a group of checklists
under a <group> node.

e.g. /sim/checklists/group/checklist

The group can have a <name>, which is used by the checklist dialog
and can be used by other interfaces, such as the FG1000.
2018-04-12 22:24:57 +01:00
Stuart Buchanan
7f09b1f3c6 FG1000: Active Flight Plan MFD Page
- View and edit the active flightplan
2018-04-06 19:52:18 +01:00
Stuart Buchanan
60352375d0 FG1000 - PFD Flightplan and improved GroupElement 2018-03-25 17:55:03 +01:00
Tobias Dammers
054da4e691 Fix: chat messages from MP list captured kbd forever 2018-03-19 09:47:16 +00:00
Thomas Geymayer
8eb3707042 canvas.gui: Fix warning when deleting widget after canvas 2018-02-27 08:42:34 +01:00
Stuart Buchanan
98e11ec207 Initial FG1000 PFD 2018-02-26 21:24:21 +00:00