-
Notifications
You must be signed in to change notification settings - Fork 109
CJ4: Quality of life improvements #480
base: main
Are you sure you want to change the base?
Conversation
this.addTitle("BRG PTR 1", this.textSize, 0.5); | ||
this.addRadio("OFF", this.textSize, [CJ4_PopupMenu_Key.BRG_PTR1_SRC]); | ||
this.addRadio("FMS1", this.textSize, [CJ4_PopupMenu_Key.BRG_PTR1_SRC]); | ||
this.addRadioRange("VOR1", this.textSize, 108, 117.95, 0.005, [CJ4_PopupMenu_Key.BRG_PTR1_SRC, CJ4_PopupMenu_Key.BRG_VOR1_FREQ]); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This code does not appear to be synchronized with the bearing pointer changes.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I rebased this branch off 0.6.5. Are bearing pointers on the pre-release yet?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
They were already on main, but this code looks moved entirely from the original location, so it may not be picking up the conflict.
These lines now should be like this:
this.beginSection();
{
this.addTitle("BRG PTR 1", this.textSize, 0.5);
this.addRadio("OFF", this.textSize, [CJ4_PopupMenu_Key.BRG_PTR1_SRC]);
this.addRadio("FMS1", this.textSize, [CJ4_PopupMenu_Key.BRG_PTR1_SRC]);
this.addRadio("VOR1", this.textSize, [CJ4_PopupMenu_Key.BRG_PTR1_SRC]);
this.addRadio("ADF1", this.textSize, [CJ4_PopupMenu_Key.BRG_PTR1_SRC]);
}
this.endSection();
this.beginSection();
{
this.addTitle("BRG PTR 2", this.textSize, 0.5);
this.addRadio("OFF", this.textSize, [CJ4_PopupMenu_Key.BRG_PTR2_SRC]);
this.addRadio("VOR2", this.textSize, [CJ4_PopupMenu_Key.BRG_PTR2_SRC]);
this.addRadio("ADF2", this.textSize, [CJ4_PopupMenu_Key.BRG_PTR2_SRC]);
}
this.endSection();
Check the original location this stuff was copied from to make sure you picked everything you need up.
{ | ||
this.addTitle("BRG PTR 2", this.textSize, 0.5); | ||
this.addRadio("OFF", this.textSize, [CJ4_PopupMenu_Key.BRG_PTR2_SRC]); | ||
this.addRadioRange("VOR2", this.textSize, 108, 117.95, 0.005, [CJ4_PopupMenu_Key.BRG_PTR2_SRC, CJ4_PopupMenu_Key.BRG_VOR2_FREQ]); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same here, missing bearing pointer changes.
...ckpits-instruments-cj4/html_ui/Pages/VCockpit/Instruments/Airliners/CJ4/Shared/CJ4_Shared.js
Outdated
Show resolved
Hide resolved
src/workingtitle-aircraft-cj4/SimObjects/Airplanes/Asobo_CJ4/flight_model.cfg
Outdated
Show resolved
Hide resolved
...s-instruments-airliners/html_ui/Pages/VCockpit/Instruments/Airliners/Shared/WT/MFD_WTMenu.js
Show resolved
Hide resolved
...ckpits-instruments-cj4/html_ui/Pages/VCockpit/Instruments/Airliners/CJ4/Shared/CJ4_Shared.js
Outdated
Show resolved
Hide resolved
05409a8
to
3e100ee
Compare
Ready for Q&A |
You added LOD00 and LOD01 GLTF. What are the changes there? I am worried it will overwrite the LOD00 already in main for the lower panel lighting |
@dga711 did you change the LOD? Cause in my tests, the lower CCP was lit up still |
@dga711 I don't know the difference between LODs but buttons/switches are declared in both, so I changed the definitions for the COM1 Tune and Cockpit speaker mute buttons. The lower CCP was lit in both tests I did on each branch. You can check to see. |
95b1770
to
c3aa3b8
Compare
This reverts commit 7bcd583.
c3aa3b8
to
981d1dc
Compare
Bug Fixes
Cameras:
Buttons/Switches/Knobs:
MFD/PFD