Skip to content

Commit

Permalink
contextmenu finalization
Browse files Browse the repository at this point in the history
linting
locales
icons to public
changelog
  • Loading branch information
sh4rkman committed Jan 14, 2025
1 parent a700b88 commit b38de30
Show file tree
Hide file tree
Showing 108 changed files with 711 additions and 449 deletions.
3 changes: 3 additions & 0 deletions config/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,9 @@ export default async (env) => {
format: {
comments: false,
},
compress: {
pure_funcs: ['console.debug'], // Removes console.debug
},
},
}),
] : [],
Expand Down
676 changes: 390 additions & 286 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "squadcalc",
"version": "35.1.0",
"version": "36.0.0",
"description": "A Complete Mortar Calculator and Map Lane Finder for Squad",
"author": "Maxime 'sharkman' Boussard",
"license": "MIT",
Expand Down
Binary file added public/icons/ally/deployables/rallypoint.webp
Binary file not shown.
Binary file added public/icons/enemy/deployables/rallypoint.webp
Binary file not shown.
6 changes: 0 additions & 6 deletions public/locales/en/deployables.json

This file was deleted.

2 changes: 2 additions & 0 deletions public/locales/en/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"useClassicCursor": "Use Classic Cursor",
"mapAnimationSettings": "Pan/Zoom Animations",
"highquality": "Very High quality maps",
"contextMenu": "Advanced Context Menu",
"fontSize": "Font Size",
"verySmall": "Very Small",
"small": "Small",
Expand Down Expand Up @@ -36,6 +37,7 @@
"revealLayerOnHover" : "Reveal layer when hovering a flag",
"circlesFlags": "Show flag as circles",
"copyNextFlags": "Auto-copy next flags to clipboard",
"showFlagsDistance": "Show distance between flags",
"shortcuts": "Shortcuts",
"enter": "Enter focus mode, hiding UI buttons",
"deleteLastTarget": "Delete last placed target on the map",
Expand Down
2 changes: 2 additions & 0 deletions public/locales/en/tooltips.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,7 @@
"lowAndHighTooltip": "Show both high and low angle for weapons that can shoot in both modes",
"autoLaneTooltip": "If only one flag is available on layer's next step, squadcalc will automatically try to avance to the next lane",
"capZoneOnHoverTooltip": "Instead of showing capzones at all times, only show them when hovering over a flag",
"contextMenuTooltip": "Right click on the map reveal a context menu allowing you to place markers",
"revealLayerOnHoverTooltip": "Hovering a flag will fade out the unreachable flags if this flag happens to be clicked"

}
2 changes: 2 additions & 0 deletions public/locales/fr/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"useClassicCursor": "Curseur classique",
"mapAnimationSettings": "Animations de zoom",
"highquality": "Carte haute qualité",
"contextMenu": "Menu contextuel avancé",
"fontSize": "Taille de la police",
"verySmall": "Très petite",
"small": "Petite",
Expand Down Expand Up @@ -36,6 +37,7 @@
"revealLayerOnHover": "Révéler le layer au survol des drapeaux",
"circlesFlags": "Drapeaux en forme de cercles",
"copyNextFlags": "Copier les prochains drapeaux",
"showFlagsDistance": "Afficher la distance entre les points",
"shortcuts": "Raccourcis",
"enter": "Entrer en mode focus, masquant les boutons de l'interface utilisateur",
"deleteLastTarget": "Supprimer la dernière cible placée sur la carte",
Expand Down
1 change: 1 addition & 0 deletions public/locales/fr/tooltips.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"targetAnimationTooltip": "Désactiver pour remplacer l'icône des marqueurs par des cercles minimalistes",
"performanceWarning": "Peut causer des problèmes de performance",
"markerDragTooltip": "Affiche la grille lors du déplacement",
"contextMenuTooltip": "Cliquez avec le bouton droit sur la carte pour révéler un menu permettant de placer des marqueurs",
"copyNextFlagsTooltip": "Lorsque vous cliquez sur un drapeau, ajoute automatiquement les drapeaux suivants au presse-papiers",
"copyTargetTooltip": "Après avoir placé/déplacé une cible, copie automatiquement les calculs dans le presse-papiers",
"lowAndHighTooltip": "Afficher à la fois l'angle haut et bas pour les armes permettant de tirer dans les deux modes",
Expand Down
2 changes: 2 additions & 0 deletions public/locales/ru/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"useClassicCursor": "Классический курсор",
"mapAnimationSettings": "Анимация панорамирования и зума",
"highquality": "HQ карты",
"contextMenu": "Расширенное контекстное меню",
"fontSize": "Размер шрифта",
"verySmall": "Очень маленький",
"small": "Маленький",
Expand Down Expand Up @@ -36,6 +37,7 @@
"revealLayerOnHover": "Показать слой при наведении на флаг",
"circlesFlags": "Показать флаги в виде кругов",
"copyNextFlags": "Автокопирование следующих флагов",
"showFlagsDistance": "Показать расстояние между флагами",
"shortcuts": "Ярлыки",
"enter": "Войти в режим фокуса, скрыв кнопки интерфейса",
"deleteLastTarget": "Удалить последнюю размещённую цель на карте",
Expand Down
1 change: 1 addition & 0 deletions public/locales/ru/tooltips.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"targetAnimationTooltip": "Отключите, чтобы заменить значки маркеров минималистичными кругами",
"performanceWarning": "Может вызвать проблемы с производительностью",
"markerDragTooltip": "Показать сетку во время перетаскивания",
"contextMenuTooltip": "Щелкните правой кнопкой мыши по карте, чтобы открыть контекстное меню и разместить маркеры",
"copyNextFlagsTooltip": "При нажатии на флаг автоматически добавлять следующие флаги в буфер обмена",
"copyTargetTooltip": "После размещения/перетаскивания цели автоматически копировать вычисления в буфер обмена",
"lowAndHighTooltip": "Показать как высокий, так и низкий угол для оружия, способного стрелять в обоих режимах",
Expand Down
2 changes: 2 additions & 0 deletions public/locales/uk/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"useClassicCursor": "классический слайдер",
"mapAnimationSettings": "Анімації масштабування",
"highquality": "Карта високої якості",
"contextMenu": "Розширене контекстне меню",
"fontSize": "Розмір шрифту",
"verySmall": "Дуже маленький",
"small": "Маленький",
Expand Down Expand Up @@ -36,6 +37,7 @@
"revealLayerOnHover": "Показати шар при наведенні на прапор",
"circlesFlags": "Показати прапори у вигляді кіл",
"copyNextFlags": "Автокопіювання наступних прапорів",
"showFlagsDistance": "Показати відстань між прапорами",
"shortcuts": "Ярлики",
"enter": "Увійти в режим фокусу, приховуючи кнопки інтерфейсу",
"deleteLastTarget": "Видалити останню розміщену ціль на карті",
Expand Down
1 change: 1 addition & 0 deletions public/locales/uk/tooltips.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"targetAnimationTooltip": "Вимкніть, щоб замінити іконки маркерів мінімалістичними колами",
"performanceWarning": "Може спричинити проблеми з продуктивністю",
"markerDragTooltip": "Показати сітку під час перетягування",
"contextMenuTooltip": "Клацніть правою кнопкою миші по карті, щоб відкрити контекстне меню та розмістити маркери",
"copyNextFlagsTooltip": "При натисканні на прапор автоматично додавати наступні прапори в буфер обміну",
"copyTargetTooltip": "Після розміщення/перетягування цілі автоматично копіювати обчислення в буфер обміну",
"lowAndHighTooltip": "Показати як високий, так і низький кут для зброї, яка може стріляти в обох режимах",
Expand Down
2 changes: 2 additions & 0 deletions public/locales/zh/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"useClassicCursor": "不使用十字线光标",
"mapAnimationSettings": "平移/缩放动画",
"highquality": "高质量底图文件",
"contextMenu": "高级右键菜单",
"fontSize": "字体大小",
"verySmall": "非常小",
"small": "",
Expand Down Expand Up @@ -36,6 +37,7 @@
"revealLayerOnHover": "悬停标志时显示图层",
"circlesFlags": "将标志显示为圆形",
"copyNextFlags": "自动复制下一个旗帜",
"showFlagsDistance": "显示旗帜之间的距离",
"shortcuts": "快捷键",
"enter": "进入聚焦模式,隐藏界面按钮",
"deleteLastTarget": "删除地图上最后放置的目标",
Expand Down
1 change: 1 addition & 0 deletions public/locales/zh/tooltips.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"targetAnimationTooltip": "禁用以将标记图标替换为简约的圆形",
"performanceWarning": "可能会导致性能问题",
"markerDragTooltip": "拖动时显示网格",
"contextMenuTooltip": "右键单击地图以显示上下文菜单,允许您放置标记",
"copyNextFlagsTooltip": "单击旗帜时,自动将下一个旗帜添加到剪贴板",
"copyTargetTooltip": "放置/拖动目标后,自动将计算复制到剪贴板",
"lowAndHighTooltip": "显示可以以高角度和低角度射击的武器的两种角度",
Expand Down
14 changes: 10 additions & 4 deletions src/components/contextMenu/contextMenu.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<button class="ctxButton allyhelipad">
<span class="allyhelipad" data-team="ally" data-category="deployables" data-icon="deployable_helipad"></span>
</button>
<button class="ctxButton mine">
<span class="mine" data-team="ally" data-category="deployables" data-icon="map_mine"></span>
<button class="ctxButton rally">
<span class="rally" data-team="ally" data-category="deployables" data-icon="rallypoint"></span>
</button>
<button class="ctxButton tow">
<span class="tow" data-team="ally" data-category="deployables" data-icon="deployable_anti_tank"></span>
Expand All @@ -39,6 +39,9 @@
<button class="ctxButton ub32rockets">
<span class="ub32rockets" data-team="ally" data-category="deployables" data-icon="deployable_ub32rockets"></span>
</button>
<button class="ctxButton mine">
<span class="mine" data-team="ally" data-category="deployables" data-icon="map_mine"></span>
</button>
</div>
</template>

Expand Down Expand Up @@ -198,8 +201,8 @@
<button class="ctxButton enemyhelipad">
<span class="enemyhelipad" data-team="enemy" data-category="deployables" data-icon="deployable_helipad"></span>
</button>
<button class="ctxButton enemymine">
<span class="enemymine" data-team="enemy" data-category="deployables" data-icon="map_mine"></span>
<button class="ctxButton enemyrally">
<span class="enemyrally" data-team="enemy" data-category="deployables" data-icon="rallypoint"></span>
</button>
<button class="ctxButton enemytow">
<span class="enemytow" data-team="enemy" data-category="deployables" data-icon="deployable_anti_tank"></span>
Expand All @@ -225,6 +228,9 @@
<button class="ctxButton enemyub32rockets">
<span class="enemyub32rockets" data-team="enemy" data-category="deployables" data-icon="deployable_ub32rockets"></span>
</button>
<button class="ctxButton enemymine">
<span class="enemymine" data-team="enemy" data-category="deployables" data-icon="map_mine"></span>
</button>
</div>
</template>

Expand Down
Loading

0 comments on commit b38de30

Please sign in to comment.