Merge branch 'unstable' into trackhat-ui

Sponsored-by: TrackHat

* unstable: (112 commits)
  Revert "accela: try more complex deadzone algorithm"
  pt: add wiki link for calibration instructions
  qfc: more gray colors when graph is disabled
  qfc, mapping: disallow editing and change color when checkbox disabled
  qfc: don't allow editing when disabled
  plugin-support: workaround multiple copies of modules
  accela: change translation gain
  accela: change rotation gain
  pt: change extraction code
  freepie-udp: add license
  freepie-udp: update
  accela: try more complex deadzone algorithm
  accela: add helpful comment
  accela: revert to more quadratic spline at start
  also save if save pending when start tracking
  ui: force saving if saving timer is pending
  accela: slightly more linear function
  pose-widget: simplify
  freepie-udp: nix harmless warning
  pose-widget: add comment
  simple-mat: add __restrict for GNU
  ui: save settings on a timer
  ui: show a warning if configuration directory can't be used
  aruco: tune min/max marker size
  win32-joystick: fix duplicate device name selection logic
  ui: no need to reset settings on tracking start
  ui: save profile when combobox text changes, not merely index
  ui: save current tracker/filter/proto, not last
  win32-joystick: fix COM failure path
  win32-joystick: nix unused variable
  win32-joystick: allow for unique selection of joysticks
  qfc: also draw line from function start while moving
  no need to save on tracking start anymore
  save axis opts, not just spline control points
  tracker: change centering order again
  fix typo
  cmake: don't say "opentrack" twice for osx build
  ui: really don't switch profiles while refreshing combobox
  pt: fix type mismatch
  ui: save prior to switching configs
  tracker_rs: adjusted tracker's name
  ui: don't reload settings if config wasn't changed
  ui: save everything before switching profiles
  options: return .ini basename easier
  tracker_rs: more readable icon
  tracker_rs: prevent potential thread starvation
  ui: switch to newly-created config
  ui: decruft
  ui: also bail on new config if its name is ".ini"
  ui: auto-refresh config list
  ui: display up to 20 profiles w/o scrolling
  ui: create an empty config properly in another code branch
  udp-tracker: silence harmless warning
  plugin-support: fix typo
  plugin-support: set more sane RTLD flags
  plugin-support: free modules from address space when needed
  ui: rename symbol to reflect current usage
  ui: move some slots to private
  ui, shortcuts: these are slots, actually
  ui: no need to write anything to new empty config
  ui: avoid potential memory leak
  ft: new game support
  game-data: chomp newlines in extractor
  ui: append extension in the right place
  simple-mat: fix arglist SFINAE
  simple-mat: can use static_cast here
  nix default empty config. it gets created on its own.
  ui: these aren't qt slots
  ui: nix wrong headers
  ui: remove GNU GPL
  ui: simplify condition
  props changed only
  main, ui: store config files in a predefined directory
  pt: show extracted points' areas and success count
  close dialogs on switch to new module
  ...

5 files changed, 2 insertions, 0 deletions

diff --git a/bin/NPClient.dll b/bin/NPClient.dll
index bf971c03..bf971c03 100755..100644
--- a/bin/NPClient.dll
+++ b/bin/NPClient.dll
diff --git a/bin/NPClient64.dll b/bin/NPClient64.dll
index fd3164e5..fd3164e5 100755..100644
--- a/bin/NPClient64.dll
+++ b/bin/NPClient64.dll
diff --git a/bin/freetrackclient.dll b/bin/freetrackclient.dll
index 3206558f..3206558f 100755..100644
--- a/bin/freetrackclient.dll
+++ b/bin/freetrackclient.dll
diff --git a/bin/settings/default.ini b/bin/settings/default.ini
deleted file mode 100644
index e69de29b..00000000
--- a/bin/settings/default.ini
+++ /dev/null
diff --git a/bin/settings/facetracknoir supported games.csv b/bin/settings/facetracknoir supported games.csv
index 98dba166..ad6f1393 100644
--- a/bin/settings/facetracknoir supported games.csv
+++ b/bin/settings/facetracknoir supported games.csv
@@ -66,6 +66,7 @@ No;Game Name;Game protocol;Supported since;Verified;By;INTERNATIONAL_ID;FTN_ID
 57;Caterpillar Simulators;FreeTrack20;V160;;;23080;0039F52E4221742FA63100
 58;CCG Metamedia;FreeTrack20;V160;;;20009;003A6FA8A8DD86FE8BDB00
 547;CDF Ghostship;FreeTrack20;V160;;;4150;02230A04C45292CC5DA400
+568;CDF Starfighter;FreeTrack20;V160;;;4153;0238E7D9A14B2A1AE98900
 59;CEWIT Immersive Cabin;FreeTrack20;V160;;;20370;003B90B5780C90078DEE00
 60;Chopper;FreeTrack20;V160;;;3150;003CC166C8632A32EA2300
 61;Clearbox;FreeTrack20;V160;;;20565;003D5C1FDE74279D1DB800
@@ -75,6 +76,7 @@ No;Game Name;Game protocol;Supported since;Verified;By;INTERNATIONAL_ID;FTN_ID
 63;Colin McRae DiRT 2;FreeTrack20;V170;V;V4Friend;8107;003F7815C5379491C73300
 64;Colin McRae Rally 04;FreeTrack20;V160;;;8103;0040D13C2A843DA526A610
 65;Comanche;FreeTrack20;V160;;;2275;00414097C36A12BA32BA00
+569;Combat Air Patrol 2;FreeTrack20;V160;;;4425;02399AAA88F5062AB14500
 66;Combat Flight Simulator 3;FreeTrack20;V160;V;V4Friend;2304;00420EC5F763AB21CA7310
 67;Combat Helo;FreeTrack20;V160;;;2001;004329DFA863FAE1EA7300
 515;Combined Arms;FreeTrack20;V160;;;1309;0203387EDB1A5AFEADB600