diff --git a/BUILD_INFO.txt b/BUILD_INFO.txt index 3eb12e7b..821222d0 100644 --- a/BUILD_INFO.txt +++ b/BUILD_INFO.txt @@ -1,6 +1,6 @@ REM-Client test build (64-bit) -date: 2026-11-13 18:51 -commit: 3bb87cdc (main) -subject: Open space: the old system's planet rings go at an in-place crossing; the new system's kept planets get theirs +date: 2026-11-13 23:06 +commit: 6e6d42cd (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 tree: clean build: OK diff --git a/EXE/Freelancer.exe b/EXE/Freelancer.exe index 137ff5ed..357e9738 100755 Binary files a/EXE/Freelancer.exe and b/EXE/Freelancer.exe differ diff --git a/EXE/remui/outfitter.rml b/EXE/remui/outfitter.rml index 35cdd62f..bf51d7eb 100644 --- a/EXE/remui/outfitter.rml +++ b/EXE/remui/outfitter.rml @@ -76,6 +76,15 @@ .dot { width: 18dp; height: 18dp; margin: 0 16dp 0 6dp; border-radius: 9dp; border: 1dp #ffffff40; } .dot.off { background-color: #1a2533; border-color: #3d5266; } .good.now { border-left-color: #5cc8f066; } + /* REM: the decal shop (category 5) -- the picture on a checkered ground (its transparent parts) */ + .stk { width: 40dp; height: 40dp; margin: 0 10dp 0 0; background-color: #1a2533; border: 1dp #3d5266; } + .stk.empty { background-color: #0f1720; } + .decal-colors { margin-top: 8dp; } + .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 .sw { width: 16dp; height: 16dp; margin-right: 3dp; border: 1dp #ffffff30; } + .decal-colors .sw.selected { border: 2dp #f2b13c; } + .decal-colors .sw:hover { border-color: #5cc8f0; } .good .now-tag { font-family: "Saira SemiCondensed"; font-weight: 600; font-size: 10dp; letter-spacing: 1dp; color: #5cc8f0; margin-right: 8dp; } @@ -96,6 +105,7 @@
Equipment
Cargo bay
Lamp Shop
The lamps of your ship: headlight, running lights and docking lights, one by one or as a set.
+
Decal Shop
Decals on your ship's hull, anywhere you like. Everyone sees them in space.
HOLD
{{ hold }}
CREDITS{{ credits }}
@@ -119,7 +129,22 @@ -
+
+

Decal Shop

{{ decal_items.size }} decals +
Decal bomb
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.
 +
+ +
+
{{ decal_wait }}
+
+ +
+
{{ r.name }}
{{ r.note }}
+ {{ r.price }} +
+
+
+

For sale here

{{ market.size }}
⚙ Autobuy
What the server buys by itself when you dock: ammunition for your launchers, nanobots and shield batteries.
@@ -152,7 +177,35 @@
-
+
+

Your decals

{{ decal_count }} +
Undo all
Back to the decals your ship has now.
 +
+
+
{{ decal_hint }}
+
+ +
+
{{ r.name }}
{{ r.note }}
+
+
+
+
Smaller
+
Larger
+ {{ decal_size }} +
Turn left
+
Turn right
+
Mirror
A second copy on the other side of the ship (counts as two decals).
+
Remove
+
+
+
+ {{ a.name }} +
+
+
+
+

Your equipment

{{ hide_mounted ? 'ON' : 'OFF' }}
loot only
Leaves out what is mounted and the ammunition, nanobots and shield batteries your ship uses: what is left is loot to sell.
 @@ -211,7 +264,16 @@ {{ lamp_total }}
{{ lamp_button }}
Fits it now. The old lamp is replaced; lamps are not sold back.
-
+
+
+
Decals on your ship
+
{{ decal_count }}
+
+ {{ decal_reason }} + {{ decal_total }} +
Apply
Buys the new decals and saves where they all sit. Moving, sizing and removing are free; decals are not sold back.
+
+
{{ side == 0 ? 'Buy' : 'Sell' }}
diff --git a/EXE/remui/player.rml b/EXE/remui/player.rml index 78bb6ef7..19cd5f1f 100644 --- a/EXE/remui/player.rml +++ b/EXE/remui/player.rml @@ -32,6 +32,19 @@ .coin-log .row .c4 { flex: 1; color: #8197ad; } /* the page Clan */ .clan-head { display: flex; flex-direction: row; align-items: center; margin-bottom: 8dp; } + /* REM: the clan decal mixer */ + .mixrow { display: flex; flex-direction: row; } + .mixprev { width: 160dp; height: 160dp; margin-right: 14dp; background-color: #0f1720; border: 1dp #3d5266; } + .mixprev img { width: 160dp; height: 160dp; } + .mixmasks { display: flex; flex-direction: row; flex-wrap: wrap; margin: 6dp 0; } + .mixmasks .mm { width: 40dp; height: 40dp; margin: 0 4dp 4dp 0; border: 1dp #3d5266; background-color: #0f1720; text-align: center; font-size: 10dp; } + .mixmasks .mm img { width: 38dp; height: 38dp; } + .mixmasks .mm.selected { border: 2dp #f2b13c; } + .mixer .crow { display: flex; flex-direction: row; align-items: center; margin-bottom: 4dp; } + .mixer .cl { width: 70dp; font-size: 12dp; color: #8197ad; } + .mixer .sw { width: 16dp; height: 16dp; margin-right: 3dp; border: 1dp #ffffff30; } + .mixer .sw.selected { border: 2dp #f2b13c; } + .mixer .actions .btn { margin-right: 4dp; } .clan-head .tagname { font-family: "Saira SemiCondensed"; font-weight: 600; font-size: 22dp; letter-spacing: 0.8dp; } .clan-head .sw { width: 14dp; height: 14dp; margin-right: 10dp; border: 1dp #dbe6f0; } .clan-head .chip { margin-left: 10dp; } @@ -193,6 +206,7 @@
Diplomacy
NPC profile
Clan
+
Decals
The clan's own decals: only its members may put them on their ships.
@@ -308,6 +322,56 @@
+ +
+
{{ cl_decal_info }}
+
+
Your clan has no decals yet.
+
+ +
+
{{ d.a }}
{{ d.b }}
+
Delete
Deletes the decal; it goes off every member's ship.
+
+
+
+
Name +
Browse ...
Picks a picture file (PNG, JPG or BMP). It is fitted into a square (transparent edges, transparency kept) and checked by the server like an admin's upload; a moderator may have to approve it first.
+
Empty name: the file's name.
+
+
Only the leader (or a rank that may edit the clan) uploads clan decals.
+ +
+

Design a clan decal

+
+
+
+
+
{{ l.a }}{{ l.on ? ' *' : '' }}
+
+
+
+ {{ m.a }}
{{ m.a }}
+
+
+
+ {{ a.a }} +
+
+
+
Smaller
Larger
+
Turn left
Turn right
+
←
↑
+
↓
→
+
Clear layer
+
+
{{ cl_mix_info }}
+
Upload design
Draws the three layers into one decal and uploads it under the name above, like a picture from a file.
+
+
+
+
+
diff --git a/EXE/rendcomp.dll b/EXE/rendcomp.dll index b0aed502..5a438f9c 100644 Binary files a/EXE/rendcomp.dll and b/EXE/rendcomp.dll differ