fly/flightgear
1
0
Fork 0
Code Activity
12826 commits 1 branch 0 tags 41 MiB
Commit graph

12826 commits

This branch
This branch
All branches
Author SHA1 Message Date
James Turner
c316bd4af8 Mark nightly builds visually on the splash. 
Ensure testers are in no doubt what they’re getting from a nightly
build.
 2017-02-26 23:58:36 +00:00
Bertrand Coconnier
b7ec790426 Flags are carried over from SimGear, no need to specify them again. 2017-02-26 16:40:59 +01:00
Peter Sadrozinski
ec4b9f8542 Alternative terrain engine based on pagedLOD 
- remove TileMgr from sub systems - add to btg terrain engine
 2017-02-26 10:17:15 -05:00
Bertrand Coconnier
6e9d4e8ae4 Linux/Unix are case sensitive. 2017-02-26 01:39:33 +01:00
James Turner
918db84ac4 New splash screen system. 
Uses TTF fonts, and displays more information textually including
the application version and current aircraft.

Also rename FGRenderer::splashinit to preinit, as was suggested
a long time ago.
 2017-02-25 21:47:58 +00:00
James Turner
17fe0460a9 Previews displayed in the launcher. 2017-02-25 21:47:58 +00:00
James Turner
38554f629f Merge /u/accek/flightgear/ branch ap-freed-pointers into next 
https://sourceforge.net/p/flightgear/flightgear/merge-requests/75/
 2017-02-25 16:41:02 +00:00
James Turner
5c0550b495 Merge /u/accek/flightgear/ branch fixlets-1 into next 
https://sourceforge.net/p/flightgear/flightgear/merge-requests/74/
 2017-02-25 16:40:01 +00:00
Bertrand Coconnier
7cbdc8b923 Sync w/ JSBSim (use SGPath to manage file names) 2017-02-25 16:22:23 +01:00
Szymon Acedański
28e9ba21f6 Fixed route manager returning freed char* pointers via tied properties 
On Mac it was visible as random strings displayed in the route manager
dialog for selected SIDs and STARs.

Depends on a SimGear change which introduces SGStringValueMethods.
 2017-02-25 15:17:03 +01:00
Szymon Acedański
e1668a2919 Fixed a number of use-after-free bugs with FGPositioneds 
These were due to converting FGPositionedRef to FGPositioned*
and then again packing the pointer into another ref-counted
FGPositionedRef.
 2017-02-25 15:10:17 +01:00
Szymon Acedański
d401a50e0a Fix crash on Mac OS X when FG does not finish input init 2017-02-25 15:05:09 +01:00
Szymon Acedański
f71c20600a Fixed erroreous reference to array instead of its element 
net->master_{bat,alt} are arrays, but were mistakenly used as
values.

This correctly generated a compilation warning.
 2017-02-25 15:05:09 +01:00
Szymon Acedański
4fd89b0b8f Fixed compilation warning on Mac 
IOHIDManagerRegisterDeviceMatchingCallback must not be called with
nullptr as the second argument.
 2017-02-25 15:05:09 +01:00
James Turner
006ca7186b Fix updating of add-on aircraft in the launcher. 
Kick off a re-scan when adding or removing paths.
 2017-02-22 17:09:24 +00:00
James Turner
72988a6bb7 Add the default hangar automatically on first-run. 
Slightly ungainly but ensures we start with the default hangar
available. It can still be removed and re-added as normal.
 2017-02-22 17:09:23 +00:00
Bertrand Coconnier
86d46ce79c Sync w/ JSBSim 2017-02-21 22:35:09 +01:00
James Turner
c04406d75a Clean shutdown+join of FLITE synthesis threads. 
use a marker value to wake the blocking queue, and allow the thread
loop to terminate cleanly, before calling join() from the parent
thread.
 2017-02-21 11:01:16 +00:00
Automatic Release Builder
989ebf73a6 new version: 2017.2.0 2017-02-20 18:52:13 +01:00
Automatic Release Builder
af93965114 new version: 2017.1.1 2017-02-20 18:52:13 +01:00
Richard Harrison
60eee7722d Another different fix for the pointer conversion issue. 
Based on the comments in the list I think it is better to keep the type that was originally provided as a reference, take the address of it, and store that in a ref_ptr.

Possibly the problem was never compiler related rather OSG related; I'm using 3.5.x and it appears that there are better built in type conversions compared to the target version of 3.2 that we are currently using.
 2017-02-17 17:56:32 +01:00
James Turner
478171b8db Testing a different fix for ref-ptr conversion. 
This ‘should’ work, but might fail the same as Richard’s
original patch. Let’s find out.
 2017-02-16 18:43:58 -08:00
Richard Harrison
2226428b85 AI Multiplayer interpolation. 
Whilst debugging I had a cannot increment nextIt - because it was at end(). No idea if this could ever happen in flight but it still seems sensible to protect against it.
 2017-02-16 20:53:44 +01:00
Richard Harrison
36fd6466b7 Multiplayer packet handling bugfix; 
Unknown property ID causes break out of the loop to ensure that no further properties are processed from the incoming packet
 2017-02-16 18:39:38 +01:00
Richard Harrison
4a156fe0b0 Temporary fix to the canvas replacement visitor 
Use pointers to allow compilation on Linux/Mac until this is fixed properly as OSG elements should always be accessed via the reference counting mechanism.
 2017-02-16 18:38:48 +01:00
Richard Harrison
cbb7915e49 Ensure to break out of the loop when an unrecognised incoming MP property id is encountered in a packet. 2017-02-16 18:30:17 +01:00
Richard Harrison
11778f595f Fixed exception caused when next is equal to end() 
This happened whilst running under debug whilst spawning at a new location so it may be an edge case, but still worth checking for
 2017-02-16 18:29:44 +01:00
Richard Harrison
bde3dd0644 Canvas texture replacement visitor compiler fix. 
Change to use pointers rather than osg::ref_ptr<osg::Group> - based on http://andesengineering.com/OSG_ProducerArticles/RefPointers/RefPointers I think that it is not possible that the scenegraph can be modified between the visitor and the modify, provided that the methods are called after each other like this:

  ReplaceStaticTextureVisitor visitor(name, new_texture);
  branch->accept(visitor);
  visitor.modify_groups();
  return visitor.getPlacements();
 2017-02-16 09:16:27 +01:00
Richard Harrison
e48a3d8b32 Replacement Texture visitor modified iterator whilst iterating 
The visitor would modify the scenegraph during the traversal by inserting groups; this is not valid when using vectors, and MSVC2015 debug RTL throws an exception when this happens.

The fix is to simply make a list of the textures that need to be modified and modify once the scenegraph traversal has finished.
 2017-02-14 18:56:38 +01:00
Richard Harrison
fa142c9464 Change log level for "prepare_ground_cache(): scenery_available returns false" message as the message occurs at a high rate and seems to be more suited at bulk rather than warn level 2017-02-14 16:08:05 +01:00
Richard Harrison
275d73d01f Multiplay: Improve log message handling for win32. 2017-02-14 16:08:04 +01:00
Florent Rougon
8f24de831d Adapt includes according to relocation of SimGear's iostreams-related files 
This change is the logical counterpart of SimGear's change from commit
79f869a7f32910197be72b21f6489fbbba02c836 that moved the following files
from simgear/misc to simgear/io/iostreams:

  gzcontainerfile.cxx
  gzcontainerfile.hxx
  gzfstream.cxx (formerly zfstream.cxx)
  gzfstream.hxx (formerly zfstream.hxx)
  sgstream.cxx
  sgstream.hxx
  sgstream_test.cxx
 2017-02-12 21:30:51 +01:00
James Turner
a83947edbf Basic validation of added scenery paths. 
Try to catch uses adding parent directories and hence missing
scenery.
 2017-02-10 23:04:00 +00:00
Bertrand Coconnier
227087b3a8 Automatic detection of the ENABLE_SIMD setting for SG: 
* Scrapped the previous code
* Instead use the symbol value imported from SG via the "CONFIG" mode of CMake find_package()
 2017-02-07 00:04:56 +01:00
Bertrand Coconnier
93a8ab99ff Fix to manage the case where SimGear include files are obtained via CMAKE_PREFIX_PATH 2017-02-05 10:27:30 +01:00
Bertrand Coconnier
044715ba05 CMake commands TRY_COMPILE and TRY_RUN are ignoring the instructions from INCLUDE_DIRECTORIES so the include directory has to specified ad hoc. 2017-02-04 22:53:22 +01:00
Bertrand Coconnier
80b8a298e1 Fix for when SimGear headers are not installed system wide (as is the case for Jenkins) 2017-02-04 21:53:18 +01:00
Bertrand Coconnier
4ab0b71fa8 The flag ENABLE_SIMD is now automatically carried over from SimGear. Mixed configurations between FG & SG could crash FG so this should not be allowed. 2017-02-04 20:21:19 +01:00
James Turner
80e45f6d9b Different solution for FGQCanvas install 
Move the install line back inside the subdir, but pull in the extra
config file so the install-bindir is defined.
 2017-02-04 08:25:41 +01:00
James Turner
311d59011c Fix an error when FGQCanvas is not defined. 
There’s various cases where FGQCanvas might be enabled but still
fail to define the target.
 2017-02-02 18:17:45 +01:00
James Turner
d05b934702 Revert "Fixes for HUD, model-manager listeners." 
This reverts commit 831053bd04.

See if this fixes the problem deleting models which Denk reported.
 2017-02-02 17:02:39 +01:00
Erik Hofman
05b2b6536b Make use of the Vector new interpolation function 2017-02-02 11:35:55 +01:00
James Turner
0f3659818b QtInfoMsg requires Qt 5.5 2017-02-01 17:36:48 +01:00
James Turner
40fbebb777 Move FGQCanvas install command 
This keeps standalone FGQCanvas build working.
 2017-01-31 17:16:03 +01:00
James Turner
8f7c0d6801 Scenery extraction: set progress text 
Fixes bug:https://sourceforge.net/p/flightgear/codetickets/1938/
 2017-01-31 17:11:44 +01:00
Richard Harrison
0bf80f9b2a Add protection to the multiplayer (AI) interpolation to protect against segfaults when the previous and next packets contain different properties. 2017-01-30 23:25:00 +01:00
Erik Hofman
e39eac8a6d Nicer, human readanle, stack trace output 2017-01-30 15:58:09 +01:00
Erik Hofman
57dc778565 Fix a last minute typo 2017-01-30 12:31:05 +01:00
Erik Hofman
182f758eb7 Add a segmentation-fault report for Linux and Apple 2017-01-30 12:29:51 +01:00
James Turner
5d27d2509f Add “—-log-file” option, to log to other locations. 
Each argument creates another log file, in the directory named. Symbolic
value ‘desktop’ creates logs on the user’s desktop.

Needs corresponding SimGear commit to build
 2017-01-30 08:01:20 +01:00