weyne/DCSOlympus
1
0
Fork 0
mirror of https://github.com/Pax1601/DCSOlympus.git synced 2025-10-29 16:56:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/peekaboo/Pax1601-main' into v0.1.0

Browse Source 
# Conflicts:
#	client/public/stylesheets/olympus.css
#	client/public/stylesheets/uikit.css
#	client/public/uikit.html
#	client/src/aic/aic.ts
#	client/src/index.ts
#	client/src/units/unitmarker.ts
#	client/views/unitcontrolpanel.ejs
This commit is contained in:
Pax1601
2023-03-03 19:03:09 +01:00
parent feef5f5ffa 6662f24ec6
commit 980cd7766d
6 changed files with 13814 additions and 1050 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/views/unitcontrolpanel.ejs
View File

@@ -1,14 +1,14 @@
<div class="ol-panel" id="unit-control-panel">
<!--
<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>