Merge branch 'main' of https://github.com/Pax1601/DCSOlympus into Pax1601-main

This commit is contained in:
PeekabooSteam
2023-02-22 16:30:16 +00:00
161 changed files with 817 additions and 591 deletions

View File

@@ -37,6 +37,7 @@
<%- include( 'atc.ejs' ) %>
<%- include('logpanel.ejs') %>
<script src="javascripts/bundle.js"></script>
</body>

View File

@@ -0,0 +1,3 @@
<div class="ol-panel ol-panel-transparent" id="log-panel">
<!-- Log entries go here -->
</div>

View File

@@ -1,6 +1,6 @@
<div class="ol-panel" id="mouse-info-panel">
<div id="measure-position-container" class="rectangular-container"><img src="images/pin.png"><div id="measure-position">---° / --- NM</div></div>
<div id="unit-position-container" class="rectangular-container"><img src="images/unit.png"><div id="unit-position">---° / --- NM</div></div>
<div class="rectangular-container"><img src="images/BEBlue.png"><div id="bullseye-2">---° / --- NM</div></div>
<div class="rectangular-container"><img src="images/BERed.png"><div id="bullseye-1">---° / --- NM</div></div>
<div id="measure-position-container" class="ol-rectangular-container"><img src="images/pin.png"><div id="measure-position">---° / --- NM</div></div>
<div id="unit-position-container" class="ol-rectangular-container"><img src="images/unit.png"><div id="unit-position">---° / --- NM</div></div>
<div class="ol-rectangular-container"><img src="images/BEBlue.png"><div id="bullseye-2">---° / --- NM</div></div>
<div class="ol-rectangular-container"><img src="images/BERed.png"><div id="bullseye-1">---° / --- NM</div></div>
</div>

View File

@@ -1,24 +1,22 @@
<div class="ol-panel" id="unit-control-panel">
<div class="ol-panel" id="unit-control-buttons">
<div class="ol-button" id="slow-button"></div>
<div class="ol-button" id="fast-button"></div>
<div class="ol-button" id="descend-button"></div>
<div class="ol-button" id="climb-button"></div>
</div>
<div id="title-label">Selected units</div>
<!--
<div id="ol-title-label">Selected units</div>
<div id="selected-units-container" class="ol-scrollable">
-->
<!-- This is where all the unit selection buttons will be shown-->
<!--
</div>
<div id="formation-creation-container" data-feature-switch="ai-formations">
<div class="rectangular-button white" id="create-formation"><img src="images\buttons\create.svg">Create formation</div>
<div class="rectangular-button white" id="undo-formation"><img src="images\buttons\erase.svg">Undo formation</div>
</div>
<div class="hl"></div>
<div class="ol-hl"></div>
-->
<div id="section-label">Controls</div>
<div class="ol-title-label">Controls</div>
<div id="flight-controls-buttons-container">
<div class="slider-container flight-control-slider" id="altitude-slider">
<div class="flight-control-title">Altitude</div>
@@ -32,34 +30,36 @@
</div>
</div>
<div id="section-label" data-feature-switch="ai-formations">Formation</div>
<div id="formation-buttons-container" data-feature-switch="ai-formations">
<div class="rectangular-button">Echelon</div>
<div class="rectangular-button">Fingertip</div>
<div class="rectangular-button">Trail</div>
<div class="rectangular-button">Line abreast</div>
<!--
<div id="section-label">Formation</div>
<div id="formation-buttons-container">
<div class="ol-rectangular-button">Echelon</div>
<div class="ol-rectangular-button">Fingertip</div>
<div class="ol-rectangular-button">Trail</div>
<div class="ol-rectangular-button">Line abreast</div>
</div>
-->
<div class="hl"></div>
<div class="ol-hl"></div>
<div id="section-label">Rules of engagement</div>
<div class="ol-title-label">Rules of engagement</div>
<div id="roe-buttons-container">
<div class="rectangular-button" id="free">Free</div>
<div class="rectangular-button" id="designated-free">Designated free</div>
<div class="rectangular-button" id="designated">Designated</div>
<div class="rectangular-button" id="return">Return</div>
<div class="rectangular-button" id="hold">Hold</div>
<div class="ol-rectangular-button" id="free">Free</div>
<div class="ol-rectangular-button" id="designated-free">Designated free</div>
<div class="ol-rectangular-button" id="designated">Designated</div>
<div class="ol-rectangular-button" id="return">Return</div>
<div class="ol-rectangular-button" id="hold">Hold</div>
</div>
<div class="hl"></div>
<div class="ol-hl"></div>
<div id="section-label">Reaction to threat</div>
<div class="ol-title-label">Reaction to threat</div>
<div id="reaction-to-threat-buttons-container">
<div class="rectangular-button" id="none">None</div>
<div class="rectangular-button" id="passive">Passive</div>
<div class="rectangular-button" id="evade">Evade</div>
<div class="rectangular-button" id="escape">Escape</div>
<div class="rectangular-button" id="abort">Abort</div>
<div class="ol-rectangular-button" id="none">None</div>
<div class="ol-rectangular-button" id="passive">Passive</div>
<div class="ol-rectangular-button" id="evade">Evade</div>
<div class="ol-rectangular-button" id="escape">Escape</div>
<div class="ol-rectangular-button" id="abort">Abort</div>
</div>
</div>

View File

@@ -1,11 +1,11 @@
<div class="ol-panel padding-large" id="unit-info-panel">
<div id="general">
<div id="unit-name"></div>
<div class="rectangular-container" id="name"></div>
<div class="rectangular-container" id="group-name"></div>
<div class="rounded-container" id="task"></div>
<div class="ol-rectangular-container" id="name"></div>
<div class="ol-rectangular-container" id="group-name"></div>
<div class="ol-rounded-container" id="task"></div>
</div>
<div class="vl h-margin-largest"></div>
<div class="ol-vl h-margin-largest"></div>
<div id="flight-data">
<div id="flight-data-label">Flight data</div>
<div id="latitude"></div>
@@ -20,7 +20,7 @@
<div class="flight-data-label">Heading</div>
<div class="flight-data-value" id="heading"></div>
</div>
<div class="vl h-margin-largest"></div>
<div class="ol-vl h-margin-largest"></div>
<div id="loadout-data">
<div id="loadout-label">Loadout</div>
<img class="flight-data-icon" src="images/icons/fuel.svg">

View File

@@ -19,7 +19,7 @@
<input type="checkbox" id="weapon-visibility" checked>
</div>
<div class="vl"></div>
<div class="ol-vl"></div>
<div class="label">Full: </div>
<div>
@@ -36,7 +36,7 @@
<input type="radio" id="minimal-visibility" name="labels" value="minimal">
</div>
<div class="vl"></div>
<div class="ol-vl"></div>
<div class="label">Olympus only: </div>
<div>
<input type="checkbox" id="uncontrolled-visibility">