Skip to content

Commit

Permalink
Merge branch 'master' into localazy-update
Browse files Browse the repository at this point in the history
  • Loading branch information
2hwk authored Oct 13, 2024
2 parents 9ffc467 + 90aeaa1 commit 4aaa9a8
Show file tree
Hide file tree
Showing 867 changed files with 71,107 additions and 41,555 deletions.
9 changes: 9 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,12 @@ BasedOnStyle: Chromium
---
Language: Cpp
ColumnLimit: 140
AlignArrayOfStructures: Left
AlignConsecutiveAssignments: Consecutive
AlignConsecutiveDeclarations: Consecutive
AlignConsecutiveShortCaseStatements:
Enabled: true




2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,5 @@ fbw-a32nx/src/systems/fmgc/src/flightplanning/WorldMagneticModel.ts
fbw-a32nx/src/systems/fmgc/src/utils/LzUtf8.js
fbw-a32nx/src/systems/fmgc/src/flightplanning/new/test/*
fbw-a32nx/src/systems/fmgc/src/flightplanning/**/*.spec.ts

fbw-a380x/src/base/flybywire-aircraft-a380-842/html_ui/Pages/VCockpit/Instruments/LegacyA380X/*
10 changes: 2 additions & 8 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,7 @@ module.exports = {
},
react: { version: 'detect' },
},
ignorePatterns: [
'fbw-common/src/typings/*',
'fbw-a380x/*',
'fbw-ingamepanels-checklist-fix/*',
'!fbw-a380x/src/systems/instruments/src/PFD/*',
'!fbw-a380x/src/systems/instruments/src/MFD/*',
],
ignorePatterns: ['fbw-common/src/typings/*', 'fbw-ingamepanels-checklist-fix/*'],
rules: {
'prettier/prettier': ['error', {}, { usePrettierrc: true }],

Expand All @@ -77,7 +71,7 @@ module.exports = {

'tailwindcss/classnames-order': 'error',
'tailwindcss/enforces-negative-arbitrary-values': 'error',
'tailwindcss/enforces-shorthand': 'error',
'tailwindcss/enforces-shorthand': 'off',
'tailwindcss/migration-from-tailwind-2': 'error',
'tailwindcss/no-contradicting-classname': 'error',
},
Expand Down
10 changes: 9 additions & 1 deletion .github/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
1. [MODEL] Replaced overhead decals - @Repsol2k
1. [MODEL] General improvements to 3d model and textures - @MoreRightRudder, @Repsol2k, @tracernz
1. [MODEL] Folding armrests - @Repsol2k
1. [LIGHTING] Fixed Automatic Lighting on Spawn depending on outside lightcondition - @Maximilian-Reuter (\_Chaoz_)
1. [LIGHTING] Fixed Automatic Lighting on Spawn depending on outside lightcondition - @Maximilian-Reuter (\_chaoz_)
1. [EFCS] Implement calculated yaw damper gain - @lukecologne (luke)
1. [EFCS] Decrease yaw damper at low speeds on ground, down to 0 below 40kts - @lukecologne (luke)
1. [FLIGHTMODEL] Fix pitch trim on approach - @donstim (donbikes)
Expand Down Expand Up @@ -92,6 +92,7 @@
1. [EFB] Added warning for not compatible aircraft type to simbrief import - @2hwk (2Cas)
1. [EFCS] Fix ground spoiler retraction after increasing TLA slightly above 0 - @lukecologne (luke)
1. [FWC] Improved LDG LT memo to take into account light position - @BravoMike99 (bruno_pt99)
1. [EFB] Added warning for not compatible aircraft type to simbrief import - @2hwk (2Cas)
1. [PRESS] Add pressurization system failures - @mjuhe (Miquel Juhe)
1. [EFB] Added simrate indicator to status bar - @2hwk (2Cas)
1. [EFB] Added simrate and pause on TOD controls to control center - @2hwk (2Cas)
Expand All @@ -114,6 +115,13 @@
1. [FMS] Selected navaids are now reset on entering the done flight phase - @tracernz (Mike)
1. [FMS] Fix tailwind component of trip wind being treated as a headwind - @BlueberryKing (BlueberryKing)
1. [FMS] Improved NAVAID page - @tracernz (Mike)
1. [MCDU] Fixed ZFW Autofill with lbs during boarding @ShreyasKallingal
1. [FADEC] Added quick start for engines and APU - @frankkopp (Frank Kopp) - @Gurgel100 (Pascal)
1. [EFB] Added expedited presets - @frankkopp (Frank Kopp)
1. [FMS] Show runway ident on lateral/vertical revision page of the missed approach point - @BlueberryKing (BlueberryKing)
1. [ECAM] Fixed ALL ECAM Button cycling through STS page and being inconsisten on press - @Maximilian-Reuter (\_chaoz_)
1. [CDU] Fix for EFOB calculation not pulling from block fuel prior to engine start - @PatM (Patrick Macken)
1. [FMS] Run vertical predictions without V-speeds - @BlueberryKing (BlueberryKing)

## 0.11.0

Expand Down
34 changes: 16 additions & 18 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@

# Project folders

# === A32NX ===
/fbw-a32nx/*
/fbw-a32nx/.env.local
!/fbw-a32nx/README.md
Expand All @@ -51,14 +52,13 @@
/fbw-a32nx/src/base/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/model/*.gltf
/fbw-a32nx/src/systems/instruments/aceBundles
/fbw-a32nx/src/systems/instruments/buildSrc/custom/*

/fbw-a32nx/src/localization/msfs/downloaded/*.locPak
/fbw-a32nx/src/systems/instruments/src/EFB/dist
/fbw-a32nx/src/systems/instruments/src/EFB/web/

/fbw-a32nx/src/wasm/systems/a320_hydraulic_simulation_graphs/*.png
/fbw-a32nx/src/wasm/systems/a320_pneumatic_simulation_graph_data/*.txt

# === A380X ===
/fbw-a380x/*
/fbw-a380x/.env.local
!/fbw-a380x/README.md
Expand All @@ -72,9 +72,11 @@
/fbw-a380x/src/systems/instruments/aceBundles
/fbw-a380x/src/localization/msfs/downloaded/*.locPak

# === Common ===
!/fbw-common/**
/fbw-common/src/systems/instruments/src/EFB/Localization/data/downloaded/*.json

# === Ingame Panels Checklist Fix ===
/fbw-ingamepanels-checklist-fix/*
!/fbw-ingamepanels-checklist-fix/README.md
!/fbw-ingamepanels-checklist-fix/docs/
Expand All @@ -83,34 +85,30 @@
!/fbw-ingamepanels-checklist-fix/src/**
/fbw-ingamepanels-checklist-fix/out

!/scripts/**

!/build-utils.js

# === Tools ===
!/tools/**
/tools/fdr2csv/*.exe
/tools/fdr2csv/build/
/tools/fdr2csv/cmake-build*

# avoid issues when switching branches during transistion from old to new structure
/src/
/fbw-common/msfs-avionics-mirror/src/sdk/build
/fbw-common/msfs-avionics-mirror/src/sdk/build/**
/msfs-avionics-mirror/
/flybywire-aircraft-a320-neo/
/flybywire-aircraft-a320-neo-lock-highlight/

# Build scripts
!/scripts/**
!/build-utils.js

# explicit exclusions
/.env
*.tgz
localazy.keys.json

# build artifacts
node_modules/
target/
obj/
cmake-build*/
*.tgz
build/
out/
cmake-*/
*.wasm
cmake-build*

localazy.keys.json

# MacOS files
**/.DS_Store
5 changes: 3 additions & 2 deletions .vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
"__wasi__",
"_LIBCPP_HAS_NO_THREADS",
"_WINDLL",
"_MBCS"
"_MBCS",
"NOMINMAX"
],
"windowsSdkVersion": "10.0.18362.0",
"compilerArgs": [
Expand All @@ -34,4 +35,4 @@
}
],
"version": 4
}
}
8 changes: 4 additions & 4 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@
"editor.formatOnSave": true
},
"[javascript]": {
"editor.defaultFormatter": "dbaeumer.vscode-eslint",
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
},
"[typescript]": {
"editor.defaultFormatter": "dbaeumer.vscode-eslint",
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
},
"[javascriptreact]": {
"editor.defaultFormatter": "dbaeumer.vscode-eslint",
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
},
"[typescriptreact]": {
"editor.defaultFormatter": "dbaeumer.vscode-eslint",
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
},
"[rust]": {
Expand Down
Loading

0 comments on commit 4aaa9a8

Please sign in to comment.