REM-Client 024d1c3f: text decals, decals leave glass clear unless wanted, insignia motifs, category tabs in the decal shop
This commit is contained in:
+3
-3
@@ -1,6 +1,6 @@
|
|||||||
REM-Client test build (64-bit)
|
REM-Client test build (64-bit)
|
||||||
date: 2026-11-13 23:06
|
date: 2026-11-14 00:04
|
||||||
commit: 6e6d42cd (main)
|
commit: 024d1c3f (main)
|
||||||
subject: Model views: the wheel zoom keeps the ship's turn and place - only the eye moves along its own view axis (ShipViewControl::ZoomTo), no PlaceCamera
|
subject: Decals: text decals (FreeType, the UI's font), decals leave glass clear unless wanted, category tabs in the shop
|
||||||
tree: clean
|
tree: clean
|
||||||
build: OK
|
build: OK
|
||||||
|
|||||||
Binary file not shown.
@@ -80,6 +80,12 @@
|
|||||||
.stk { width: 40dp; height: 40dp; margin: 0 10dp 0 0; background-color: #1a2533; border: 1dp #3d5266; }
|
.stk { width: 40dp; height: 40dp; margin: 0 10dp 0 0; background-color: #1a2533; border: 1dp #3d5266; }
|
||||||
.stk.empty { background-color: #0f1720; }
|
.stk.empty { background-color: #0f1720; }
|
||||||
.decal-colors { margin-top: 8dp; }
|
.decal-colors { margin-top: 8dp; }
|
||||||
|
.cats { display: flex; flex-direction: row; flex-wrap: wrap; margin: 0 0 6dp 0; }
|
||||||
|
.cats .tab { padding: 2dp 8dp; margin: 0 4dp 4dp 0; font-size: 12dp; border: 1dp #3d5266; }
|
||||||
|
.cats .tab.active { border-color: #f2b13c; color: #f2b13c; }
|
||||||
|
.decal-text { display: flex; flex-direction: row; align-items: center; margin-top: 6dp; }
|
||||||
|
.decal-text .cl { width: 70dp; font-size: 12dp; color: #8197ad; }
|
||||||
|
.decal-text input { flex: 1; }
|
||||||
.decal-colors .crow { display: flex; flex-direction: row; align-items: center; margin-bottom: 4dp; }
|
.decal-colors .crow { display: flex; flex-direction: row; align-items: center; margin-bottom: 4dp; }
|
||||||
.decal-colors .cl { width: 70dp; font-size: 12dp; color: #8197ad; }
|
.decal-colors .cl { width: 70dp; font-size: 12dp; color: #8197ad; }
|
||||||
.decal-colors .sw { width: 16dp; height: 16dp; margin-right: 3dp; border: 1dp #ffffff30; }
|
.decal-colors .sw { width: 16dp; height: 16dp; margin-right: 3dp; border: 1dp #ffffff30; }
|
||||||
@@ -134,6 +140,9 @@
|
|||||||
<span class="tools"><div class="btn" data-action="decal-bomb">Decal bomb<div class="tip">Up to 12 decals at random places of your hull, overlapping - the decal you carry, else any of the shop. Apply buys them; Undo all takes them back.</div></div></span>
|
<span class="tools"><div class="btn" data-action="decal-bomb">Decal bomb<div class="tip">Up to 12 decals at random places of your hull, overlapping - the decal you carry, else any of the shop. Apply buys them; Undo all takes them back.</div></div></span>
|
||||||
</div>
|
</div>
|
||||||
<input class="text search" type="text" data-value="filter" maxlength="40"/>
|
<input class="text search" type="text" data-value="filter" maxlength="40"/>
|
||||||
|
<div class="cats">
|
||||||
|
<div class="tab" data-for="c : decal_cats" data-class-active="c.hex == '1'" data-action="decal-cat" data-attr-data-arg="c.key">{{ c.name }}</div>
|
||||||
|
</div>
|
||||||
<div class="list">
|
<div class="list">
|
||||||
<div class="hint" style="padding: 10dp;" data-if="decal_wait != ''">{{ decal_wait }}</div>
|
<div class="hint" style="padding: 10dp;" data-if="decal_wait != ''">{{ decal_wait }}</div>
|
||||||
<div class="good" data-for="r : decal_items" data-class-selected="r.selected" data-action="decal-pick" data-attr-data-arg="r.key">
|
<div class="good" data-for="r : decal_items" data-class-selected="r.selected" data-action="decal-pick" data-attr-data-arg="r.key">
|
||||||
@@ -196,8 +205,12 @@
|
|||||||
<div class="btn" data-action="decal-turn" data-arg="-">Turn left</div>
|
<div class="btn" data-action="decal-turn" data-arg="-">Turn left</div>
|
||||||
<div class="btn" data-action="decal-turn" data-arg="+">Turn right</div>
|
<div class="btn" data-action="decal-turn" data-arg="+">Turn right</div>
|
||||||
<div class="btn" data-if="decal_can_mirror" data-class-active="decal_mirror" data-action="decal-mirror">Mirror<div class="tip">A second copy on the other side of the ship (counts as two decals).</div></div>
|
<div class="btn" data-if="decal_can_mirror" data-class-active="decal_mirror" data-action="decal-mirror">Mirror<div class="tip">A second copy on the other side of the ship (counts as two decals).</div></div>
|
||||||
|
<div class="btn" data-class-active="decal_glass" data-action="decal-glass">{{ decal_glass ? 'On glass: yes' : 'On glass: no' }}<div class="tip">Whether the decal also covers glass - the cockpit, windows. Off: it leaves them clear.</div></div>
|
||||||
<div class="btn" data-action="decal-remove">Remove</div>
|
<div class="btn" data-action="decal-remove">Remove</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="decal-text" data-if="decal_is_text">
|
||||||
|
<span class="cl">Text</span><input class="text" type="text" data-value="decal_text" maxlength="24"/>
|
||||||
|
</div>
|
||||||
<div class="decal-colors" data-if="decal_areas.size > 0">
|
<div class="decal-colors" data-if="decal_areas.size > 0">
|
||||||
<div class="crow" data-for="a : decal_areas">
|
<div class="crow" data-for="a : decal_areas">
|
||||||
<span class="cl">{{ a.name }}</span>
|
<span class="cl">{{ a.name }}</span>
|
||||||
|
|||||||
Binary file not shown.
Reference in New Issue
Block a user