Commit graph

1723 commits

Author SHA1 Message Date
Jonathan Redpath
7abd49533f Add ovhd light / dome 2018-11-09 14:21:11 +00:00
Jonathan Redpath
d0681ba300 Add ped lt to engine panel, add dome light to integ lights 2018-11-09 14:17:44 +00:00
cbad3576ee Added flashlight, turned on/off by 'L' key
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-11-09 00:31:14 +01:00
Joshua Davidson
09d5eea23c GIT: Merge master 2018-11-07 18:27:29 -05:00
Joshua Davidson
31a3bd4b4f VC: Fix my stupid 2018-11-07 18:18:12 -05:00
Joshua Davidson
fb2144c056 VC: Fix floating point in MCDU dim 2018-11-07 18:16:13 -05:00
8399484b1e Removed accidentaly added line
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-11-08 00:03:00 +01:00
5d867b9cdf Made MCDU dimable
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-11-07 23:50:30 +01:00
Joshua Davidson
2f0521a1a2 GIT: Merge master 2018-11-07 17:20:58 -05:00
Joshua Davidson
d2c39ef389 Sim: Fix bugs in lighting 2018-11-07 17:18:17 -05:00
Joshua Davidson
2420df185f Merge branch 'master' into dev 2018-10-30 19:30:06 -04:00
Joshua Davidson
9a12ebe876 System: Bugfix and rework the EFIS controller 2018-10-30 19:28:49 -04:00
Jonathan Redpath
7ae182f62a correction 2018-10-29 16:08:40 +00:00
Jonathan Redpath
943f21966f Disabe cubemap 2018-10-29 14:46:19 +00:00
Jonathan Redpath
a3fefbbadb Add ATC to effect 2018-10-25 17:26:52 +01:00
Jonathan Redpath
c5751a28cc Shadows: fixes 2018-10-25 16:52:24 +01:00
Jonathan Redpath
d7fd2f8a81 Pedestal flood light 2018-10-25 15:36:32 +01:00
Jonathan Redpath
750e5ad8f7 improve reading light lightmap 2018-10-25 13:08:48 +01:00
Jonathan Redpath
3b0654667f Merge branch 'master' of https://github.com/it0uchpods/IDG-A32X into dome-light 2018-10-25 13:07:56 +01:00
Joshua Davidson
8999642bed Merge branch 'master' into dev 2018-10-24 15:01:20 -04:00
Joshua Davidson
a17f0337fc VC: Fix RMP2 XFR button binding 2018-10-24 15:00:30 -04:00
Jonathan Redpath
50773f4ac4 Transition to model-interior, add shadows in cockpit 2018-10-24 14:45:20 +01:00
Jonathan Redpath
91d85615cc Rebake lightmap 2018-10-24 13:57:41 +01:00
Jonathan Redpath
b1c7dc1c19 Add lights to elec 2018-10-23 16:46:36 +01:00
Jonathan Redpath
4da271c2c8 Add reading light (hooked to main panel lt until other knob can be simulated 2018-10-23 16:33:11 +01:00
Jonathan Redpath
e6dc2338e4 Irradiance: remove from FCU 2018-10-23 15:04:15 +01:00
Jonathan Redpath
b1589fff02 Merge branch 'master' into dome-light 2018-10-23 14:44:19 +01:00
Jonathan Redpath
a67c26fbb8 Cockpit irradiance and extend dome light to DDRMI and brakes 2018-10-23 12:22:53 +01:00
Jonathan Redpath
e1e272e6b4 Improve panel flood 2018-10-22 20:25:10 +01:00
Jonathan Redpath
642ac02ad5 Add panel flood light 2018-10-22 16:38:07 +01:00
Joshua Davidson
a1d1c60b2b GIT: Merge master 2018-10-21 16:52:28 -04:00
Joshua Davidson
316c66b927 System: Improve RMP system 2018-10-21 16:47:55 -04:00
c309ddcf3b Added animation and a bit of functionality to the ACP
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-10-21 17:12:35 +02:00
Jonathan Redpath
2bef070f2c Extend dome light to most objects, hook up to elec 2018-10-20 16:56:31 +01:00
Jonathan Redpath
ca9d3aa0a0 Lighting: add dome light 2018-10-19 20:11:44 +01:00
Joshua Davidson
9d7c53c1be Merge branch 'master' into dev 2018-10-18 16:21:51 -04:00
Joshua Davidson
ccdc77e555 VC: Refactor DDRMI animations 2018-10-17 21:07:56 -04:00
Joshua Davidson
8e8c0cac50 GIT: Remove files for old DDRMI 2018-10-17 16:38:26 -04:00
Thorsten
f5baacb5c1 VC: New DDRMI device
New DDRMI device
2018-10-17 21:06:33 +02:00
Joshua Davidson
b3d23e82a2 Merge branch 'master' into dev 2018-10-15 16:41:58 -04:00
Joshua Davidson
d3a35b41c9 Control: Rework trim system, fix bugs 2018-10-15 16:29:00 -04:00
Joshua Davidson
edb46c17e9 VC: Fix capital problem 2018-10-14 14:04:12 -04:00
Thorsten
e65adb38e2 VC: Main Panel updated
More detaild Main Panel with new texture, Brake Press and Gear Lever are new, Pedestal moved
2018-10-14 16:44:04 +02:00
Joshua Davidson
4361dcb787 Merge branch 'master' into dev 2018-10-13 19:17:44 -04:00
Joshua Davidson
2e9f12f8a1 GIT: Fix something that makes no sense 2018-10-11 19:43:51 -04:00
Joshua Davidson
1054e2bb97 GIT: Formatting 2018-10-11 19:40:53 -04:00
Joshua Davidson
8a8ef47ee0 GIT: Merge master 2018-10-08 13:03:26 -04:00
Jonathan Redpath
1232c07beb 3D: light up landing gear lever label 2018-10-02 14:31:48 +01:00
c53c5547fe Merged
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-29 22:48:27 +02:00
f42775cf2b Reverted SEL light on RMP back to amber
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-29 22:43:40 +02:00
50a9bef1ed Reverted SEL light on RMP back to amber
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-29 22:41:32 +02:00
Joshua Davidson
09ded96e57 Merge branch 'master' into dev 2018-09-29 16:09:41 -04:00
Joshua Davidson
1c173768e2 DU: Fix nasal error in UECAM 2018-09-29 16:09:17 -04:00
Thorsten
26330a5214 VC: Some fixws on the upper pedestal 2018-09-29 21:03:11 +02:00
bb47180812 Fexed display problem on crz page
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-29 12:51:58 +02:00
6ffae323c2 Merge branch 'dev' of https://github.com/it0uchpods/IDG-A32X into dev 2018-09-29 12:44:37 +02:00
Joshua Davidson
195349458a Merge branch 'master' into dev 2018-09-28 22:13:00 -04:00
Joshua Davidson
30bf47f753 Sim: Add MCDU dialogs! 2018-09-28 22:12:42 -04:00
000fd3cffb Merge branch 'dev' of https://github.com/it0uchpods/IDG-A32X into dev 2018-09-28 23:45:32 +02:00
Joshua Davidson
3498dbdb5e Merge branch 'dev' of github.com:it0uchpods/IDG-A32X into dev 2018-09-28 17:35:53 -04:00
Joshua Davidson
bac7d4d3fb GIT: Merge master 2018-09-28 17:35:48 -04:00
Joshua Davidson
6dd36477ba MCDU: Fix ADF on RADNAV being STUPID 2018-09-28 17:33:01 -04:00
Joshua Davidson
560c375ad3 System: Fix buggy, broken, and incorrect RAT logic, fixes #45 2018-09-28 17:00:56 -04:00
b7a17cecf7 Removed debug printout in Lower-ECAM.nas
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-28 21:37:09 +02:00
8da4852213 Merge branch 'dev' of https://github.com/it0uchpods/IDG-A32X into dev 2018-09-28 14:45:35 +02:00
Jonathan Redpath
d93b40cfef ECAM improvements 2018-09-28 13:43:07 +01:00
05b3e7f850 Merged
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-28 13:38:16 +02:00
Jonathan Redpath
4d92e8adb8 ECAM: pack faults 2018-09-28 12:26:20 +01:00
91f8a237f3 Merge branch 'dev' of https://github.com/it0uchpods/IDG-A32X into dev 2018-09-27 20:30:55 +02:00
Joshua Davidson
886c60903c Merge branch 'master' into dev 2018-09-27 14:29:41 -04:00
Joshua Davidson
8201bc3dc3 System: Integrate radios properly into acconfig, and some fixes 2018-09-27 14:22:02 -04:00
Joshua Davidson
4fd893cb54 Merge rmp, some fixes 2018-09-27 13:47:26 -04:00
8f498b1819 Fixed, RMP2 part beeing on DC-ESS
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-27 16:32:44 +02:00
8f47d3c037 Added VHF3 to the RMPs and fixed a few issues
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-27 16:28:18 +02:00
c206731e01 Animate LECAM page select keys
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-26 21:26:40 +02:00
44cf8a8997 Merge branch 'dev' of https://github.com/it0uchpods/IDG-A32X into dev 2018-09-26 20:54:27 +02:00
be5aee8fef Change to comply with coding conventions
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-26 20:53:06 +02:00
cafa1d6001 Added functionality to the RMP. VHF1 + VHF2 fully working
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-26 20:42:57 +02:00
Joshua Davidson
a703f9d5c1 Merge branch 'master' into dev 2018-09-25 09:55:35 -04:00
Joshua Davidson
20354e95c4 DU: Fix bug in UECAM due to duplicate prop node spec 2018-09-25 09:52:11 -04:00
9e0cbe1a90 Round oil qt on crz page
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-24 14:55:26 +02:00
7bed492937 Fixed all problems cause by move to props.nas
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-24 12:41:09 +02:00
18ca7631c6 Cleaning up not needed tabs
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-24 01:32:14 +02:00
Joshua Davidson
792c606b98 Merge branch 'master' into dev 2018-09-23 18:56:26 -04:00
726a373a6d Added missing ';'
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-23 18:55:29 -04:00
b1e06af352 Added missing ';'
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-24 00:51:59 +02:00
4bf8d0e3d3 Merge branch 'dev' of https://github.com/it0uchpods/IDG-A32X into dev 2018-09-24 00:38:03 +02:00
Joshua Davidson
150bef4e11 Merge branch 'master' into dev 2018-09-23 18:37:03 -04:00
Joshua Davidson
670ea0c708 VC: Fix backwards rotation on eng mode selector 2018-09-23 18:36:51 -04:00
6227df4654 Merge upstream
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-24 00:30:04 +02:00
Joshua Davidson
d1a73b3d69 VC: Bugfixes to some lights 2018-09-23 18:27:58 -04:00
Joshua Davidson
52d15a9483 VC: Bugfixes to some lights 2018-09-23 18:26:45 -04:00
9c90363e59 Removed lines I accidently left over
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-23 23:57:19 +02:00
Thorsten
9b6e63179e VC: Upper Pedestal completely renewed 2018-09-23 23:46:37 +02:00
Joshua Davidson
430ce1fa9b Merge branch 'master' into dev 2018-09-23 11:52:54 -04:00
Joshua Davidson
3aa56a8627 DU: Bugfix UECAM 2018-09-23 11:52:19 -04:00
Joshua Davidson
48f81cfd3a DU: Inhibit power up self test in flight 2018-09-23 11:41:32 -04:00
7b64feaa1e Moved Lower-ECAM.nas to props.nas
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-23 17:02:47 +02:00
016a9ba03d Merge branch 'dev' of https://github.com/it0uchpods/IDG-A32X into dev 2018-09-23 12:22:29 +02:00
Joshua Davidson
411a1f216b Merge branch 'master' into dev 2018-09-20 14:21:43 -04:00
Joshua Davidson
95d999f6cb DU: Fix serious DU6 bug, fix ND position 2018-09-20 14:18:42 -04:00
638e3e91ea Fix CRZ page oil beeing in wrong function
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-20 20:16:17 +02:00
5029cdda1c Merge branch 'dev' of https://github.com/it0uchpods/IDG-A32X into dev 2018-09-20 19:59:19 +02:00
Joshua Davidson
7bc07c8d5b GIT: Merge master 2018-09-20 13:57:20 -04:00
Joshua Davidson
4b87a65af4 GIT: Formatting 2018-09-20 13:54:43 -04:00
Joshua Davidson
048e5fad4b DU: Add back the refactored ND.nas 2018-09-20 13:50:33 -04:00
d5ab68433c Added first animation to crz page
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-20 16:13:10 +02:00
Jonathan Redpath
1115bb90cc Upper ECAM: props.nas 2018-09-19 17:19:54 +01:00
Jonathan Redpath
0a96b4e1f1 PFD: props.nas redo 2018-09-18 20:09:27 +01:00
Joshua Davidson
13609e116b DU: Temporarily roll back problematic code update, IESI: Fix not-initialized variable 2018-09-15 20:11:39 -04:00
67f2b1ace2 Merge branch 'dev' of https://github.com/it0uchpods/IDG-A32X into dev 2018-09-14 23:27:34 +02:00
Joshua Davidson
ba48e45b7a Merge branch 'master' into dev 2018-09-14 16:06:17 -04:00
Joshua Davidson
c5f5a484ee IESI: Fix ALT TENS tape 2018-09-14 16:00:16 -04:00
10d786e989 Merge branch 'dev' of https://github.com/it0uchpods/IDG-A32X into dev 2018-09-14 14:59:03 +02:00
Joshua Davidson
f80a16382c Merge branch 'dev' of github.com:it0uchpods/IDG-A32X into dev 2018-09-14 08:50:52 -04:00
Joshua Davidson
a57e2c7419 Merge branch 'master' into dev 2018-09-14 08:46:07 -04:00
Joshua Davidson
3fde37d108 DU: Fix numerous PFD bugs after props.nas transition 2018-09-14 08:45:23 -04:00
e53e3c122e Merge branch 'dev' of https://github.com/it0uchpods/IDG-A32X into dev 2018-09-14 13:18:55 +02:00
Jonathan Redpath
e9182d546c ECAM: Adjust fuel page 2018-09-14 11:59:07 +01:00
073b9a194b Merge branch 'dev' of https://github.com/it0uchpods/IDG-A32X into dev 2018-09-14 12:56:05 +02:00
Jonathan Redpath
1efa423e99 ECAM: Adjust cond page 2018-09-14 11:55:08 +01:00
b4629480fc Merge branch 'dev' of https://github.com/it0uchpods/IDG-A32X into dev 2018-09-14 12:43:16 +02:00
Jonathan Redpath
227329ada1 ECAM: Adjust bleed page 2018-09-14 11:39:24 +01:00
Jonathan Redpath
cd96c99a96 Merge branch 'master' into dev 2018-09-14 11:21:28 +01:00
Jonathan Redpath
c5ed493558 Bugfix: catch a potential floating point error as reccomended by Richard, attempt to fix nasal nil error 2018-09-14 11:15:21 +01:00
Jonathan Redpath
1a9771709d PFD: Transition to props.nas 2018-09-14 10:51:05 +01:00
d970754180 Added Manual LECAM page select logic
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-14 11:35:00 +02:00
aea8bb1e52 Merge branch 'dev' of https://github.com/it0uchpods/IDG-A32X into dev 2018-09-14 10:31:28 +02:00
Joshua Davidson
bb9f64858c System: Base Core for lower ECAM pages 2018-09-13 18:52:24 -04:00
49a04cf5a4 Added crz page lecam canvas
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-13 19:40:17 +02:00
Joshua Davidson
39c141dc82 Merge branch 'master' into dev 2018-09-09 09:47:12 -04:00
Jonathan Redpath
5e3db54d8e IESI: increase update rate slightly 2018-09-08 17:27:47 +01:00
Jonathan Redpath
9c0a45045d IESI: transition to props.nas 2018-09-08 17:27:16 +01:00
Joshua Davidson
c0b991efd1 Merge branch 'ECAM-sys-develop' into dev 2018-09-05 21:08:25 -04:00
Joshua Davidson
9550927d69 Merge branch 'FMGC' into dev 2018-09-05 21:08:19 -04:00
Joshua Davidson
3764d88a88 DU: Add PFD FBW limits 2018-09-05 21:01:40 -04:00
Joshua Davidson
d24c2f1c54 MCDU: Rework and remove duplicate code, cleanup, make RETURN work on MCDU page 2018-08-29 17:34:11 -04:00
Joshua Davidson
a015d8e451 Merge branch 'master' into ECAM-sys-develop 2018-08-24 13:15:59 -04:00
Joshua Davidson
9f759a9e0c DU: Fix APU page bleed bug 2018-08-24 13:15:24 -04:00
Joshua Davidson
9ebdc9fa84 System: Fix Elec Battery logic, finish ELEC ECAM page 2018-08-24 12:23:59 -04:00
Joshua Davidson
b0a6bbd61a Merge branch 'master' into ECAM-sys-develop 2018-08-24 10:52:33 -04:00
Joshua Davidson
3514d5f99a Merge branch 'master' into Lower-ECAM 2018-08-24 10:51:17 -04:00
Joshua Davidson
cc1622c33b Merge branch 'autopush' of github.com:merspieler/IDG-A32X into autopush-chk 2018-08-24 08:45:49 -04:00
50f0d6df29 Updated autopush to v1.0-rc2
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-08-23 16:37:44 +02:00
Joshua Davidson
9c0dfc5dd4 Merge branch 'master' into ECAM-sys-develop 2018-08-17 13:19:06 -04:00
Joshua Davidson
3ac73a263f Merge branch 'master' into Lower-ECAM 2018-08-17 13:06:43 -04:00
Joshua Davidson
f2447bf346 Control: Improvements to Integrator FBW behavior 2018-08-15 11:18:38 -04:00
Joshua Davidson
c793bf5add Merge branch 'master' into Lower-ECAM 2018-08-13 14:03:43 -04:00
9a3ac4e9c9 Fixed missplaced pushback model
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-08-08 23:28:44 +02:00
Jonathan Redpath
0c62d99bec ECAM 2018-08-07 10:30:07 +01:00