diff --git a/BUILD_INFO.txt b/BUILD_INFO.txt index f2b27f4f..ac326392 100644 --- a/BUILD_INFO.txt +++ b/BUILD_INFO.txt @@ -1,6 +1,6 @@ REM-Client test build (64-bit) -date: 2026-11-10 16:18 -commit: a5781269 (main) -subject: Account window: show the generated account key, as retail (issue #9) +date: 2026-11-10 16:26 +commit: b4a20f12 (main) +subject: QoL: depot search, depot item by mail, loadout sharing and seller bases, bookmark folders, trade log tree: clean build: OK diff --git a/DLLS/BIN/content.dll b/DLLS/BIN/content.dll index 010f84f5..58454b2d 100644 Binary files a/DLLS/BIN/content.dll and b/DLLS/BIN/content.dll differ diff --git a/EXE/DALib.dll b/EXE/DALib.dll index 2f4e0b89..e3a6a84c 100644 Binary files a/EXE/DALib.dll and b/EXE/DALib.dll differ diff --git a/EXE/Freelancer.exe b/EXE/Freelancer.exe index cd94f313..c187ea02 100755 Binary files a/EXE/Freelancer.exe and b/EXE/Freelancer.exe differ diff --git a/EXE/alchemy.dll b/EXE/alchemy.dll index 8dc9a655..3aef4b60 100644 Binary files a/EXE/alchemy.dll and b/EXE/alchemy.dll differ diff --git a/EXE/common.dll b/EXE/common.dll index 180a4892..56fa3d36 100644 Binary files a/EXE/common.dll and b/EXE/common.dll differ diff --git a/EXE/dacom.dll b/EXE/dacom.dll index 77b43647..b7ff03a9 100644 Binary files a/EXE/dacom.dll and b/EXE/dacom.dll differ diff --git a/EXE/deformable2.dll b/EXE/deformable2.dll index 83294341..38c567eb 100644 Binary files a/EXE/deformable2.dll and b/EXE/deformable2.dll differ diff --git a/EXE/engbase.dll b/EXE/engbase.dll index 71c40fbd..75cc0f2a 100644 Binary files a/EXE/engbase.dll and b/EXE/engbase.dll differ diff --git a/EXE/flmaterials.dll b/EXE/flmaterials.dll index 50f6d86f..dca71747 100644 Binary files a/EXE/flmaterials.dll and b/EXE/flmaterials.dll differ diff --git a/EXE/imeui.dll b/EXE/imeui.dll index a06bc7cf..0de0400a 100644 Binary files a/EXE/imeui.dll and b/EXE/imeui.dll differ diff --git a/EXE/luaprofile.dll b/EXE/luaprofile.dll index 2dd62ed9..23b519c9 100644 Binary files a/EXE/luaprofile.dll and b/EXE/luaprofile.dll differ diff --git a/EXE/readfile.dll b/EXE/readfile.dll index f1b29d7c..84efa18c 100644 Binary files a/EXE/readfile.dll and b/EXE/readfile.dll differ diff --git a/EXE/remoteclient.dll b/EXE/remoteclient.dll index bc53d36a..6508ca76 100644 Binary files a/EXE/remoteclient.dll and b/EXE/remoteclient.dll differ diff --git a/EXE/remoteserver.dll b/EXE/remoteserver.dll index 737be3d1..b4adf14d 100644 Binary files a/EXE/remoteserver.dll and b/EXE/remoteserver.dll differ diff --git a/EXE/remui/base.rml b/EXE/remui/base.rml index f4a67216..5676e554 100644 --- a/EXE/remui/base.rml +++ b/EXE/remui/base.rml @@ -175,6 +175,7 @@
Mail{{ mail_unread }}
Letters to any pilot, also offline - with credits and items from your depot.
Loadouts
Save your mounted equipment and put it back on with one click - what is missing is bought here.
+
Trade log
Your buys and sales of commodities with the profit of each sale.
@@ -204,17 +205,39 @@
{{ r.b }}{{ r.a }}{{ r.c }}{{ r.d }} + Mark
Sets a bookmark on the nav map (folder Loadouts) at the base that sells it.
Apply
Mounts what is in the hold, buys what is missing on this base and mounts it.
Delete
+
Share with group
Your group's members get a copy (as "name (from you)").
+
+
+ Send to: + {{ r.a }}
{{ lo_msg }}
+ +
+

Trade log

{{ journal.size }} lines
Refresh
+
{{ journal_note }}
+
+
WhenDealBasePrice (total)Profit
+
+
No trades yet. Buys and sales of commodities show here, a sale with its profit against what you paid.
+
+ {{ r.a }}{{ r.b }}{{ r.c }}{{ r.d }}{{ r.e }} +
+
+
+
"?" - no profit known: the goods came from elsewhere (a depot, a mission, a trade) or before the log.
+
+
@@ -236,7 +259,7 @@
ItemTypeAmount
{{ depot_state < 0 ? 'Waiting for the server...' : 'The depot is empty.' }}
-
+
{{ r.a }}{{ r.b }}{{ r.c }}
@@ -266,6 +289,7 @@
Withdraw to hold
Moves the amount of the depot item you picked into your cargo hold.
Deposit to depot
Moves the amount of the cargo you picked into the depot on this base.
+
Send by mail
Attaches the amount of the depot item you picked to a new letter (page Mail). A right click on a depot item does it too.
@@ -274,6 +298,15 @@

Your depots

{{ depots.size }} bases
+
Search a base or an item - every depot that holds it is listed, with how much.
+
+
ItemBaseAmount
+
+
{{ depot_find_note }}
+
{{ r.a }}{{ r.b }}{{ r.c }}
Double click: open this depot on the Depot page.
+
+
+
{{ depot_find_note }}
BaseItems
diff --git a/EXE/remui/group.rml b/EXE/remui/group.rml index abbcc616..d9c455f3 100644 --- a/EXE/remui/group.rml +++ b/EXE/remui/group.rml @@ -53,7 +53,7 @@

Friends

No friends yet. Add a pilot by name, or right click a name (chat, contacts) - Add friend.
- {{ f.name }}{{ f.where }}Remove + {{ f.name }}{{ f.where }}InviteInvites the pilot into your group.MailWrites a letter (base manager, page Mail) - also when the pilot is offline.Remove
diff --git a/EXE/remui/navmap.rml b/EXE/remui/navmap.rml index 2dd54994..78aa72ce 100644 --- a/EXE/remui/navmap.rml +++ b/EXE/remui/navmap.rml @@ -67,6 +67,18 @@ .bookmark .lbl { color: #f2b13c; } .bookmark.locked .s { border-color: #f2b13c; background-color: #8a6420; } .bookmark.sel .s { border-color: #ffffff; } + /* REM: a bookmark's own colour over its dot; the group's shared waypoints */ + .mi .bc { position: absolute; left: -4dp; top: -4dp; width: 8dp; height: 8dp; border-radius: 4dp; } + .gwp .s { left: -5dp; top: -5dp; width: 10dp; height: 10dp; background-color: #6fd08c; border: 2dp #05080d; transform: rotate(45deg); } + .gwp .lbl { color: #6fd08c; } + .hit.fold { padding: 6dp 10dp 2dp 10dp; color: #f2b13c; font-size: 12dp; border-bottom: 0; } + .hit .dot { width: 8dp; height: 8dp; border-radius: 4dp; margin: 5dp 8dp 0 0; } + .hit .hw { font-size: 11dp; color: #8197ad; margin-left: 6dp; white-space: nowrap; } + .mtools { display: flex; flex-direction: row; flex-wrap: wrap; align-items: center; margin: 2dp 10dp 4dp 10dp; } + .mtools .mk { margin: 0 6dp 0 0; padding: 0 6dp; font-size: 11dp; color: #8197ad; border: 1dp #24405c; border-radius: 2dp; } + .mtools .mk:hover, .mtools .mk.on { color: #f2b13c; border-color: #f2b13c; } + .sw { width: 14dp; height: 14dp; border-radius: 7dp; margin: 0 5dp 0 0; border: 1dp #24405c; } + .sw:hover { border-color: #ffffff; } .hit .mk { margin-left: 6dp; padding: 0 6dp; font-size: 11dp; color: #8197ad; border: 1dp #24405c; border-radius: 2dp; } .hit .mk:hover { color: #f2b13c; border-color: #f2b13c; } .hit .mk.del:hover { color: #ef6a5b; border-color: #ef6a5b; } @@ -119,6 +131,7 @@
+
{{ i.label }}
@@ -170,9 +183,42 @@

Known uncharted systems

{{ u.name }}{{ u.kind }}
-
+

Bookmarks

-
{{ b.name }}{{ b.kind == 'locked' ? 'Unlock' : 'Lock' }}{{ b.kind == 'locked' ? 'Locked: it can be neither moved nor deleted. Click to unlock.' : 'Lock it in place: no moving, no deleting.' }}×
+
+ All systemsEvery bookmark, of every system - a click goes there, a double click sets a waypoint (the route). + ExportCopies the bookmarks as text (REM-BOOKMARK lines) - to paste into Discord or a file. + ImportAdds the REM-BOOKMARK lines of the clipboard (someone's export). +
+
{{ marks_note }}
+
No bookmarks here. Pick a place and press Bookmark.
+
+
{{ b.name }}
+
{{ b.name }}{{ b.where }}{{ b.kind == 'locked' ? 'Unlock' : 'Lock' }}{{ b.kind == 'locked' ? 'Locked: it can be neither moved nor deleted. Click to unlock.' : 'Lock it in place: no moving, no deleting.' }}×Click: go there. Double click: a waypoint there (the route). Right click: more.
+
+
+
+ Folder + +
Set
+
+
+ Colour + + + + + + + +
+
+
+
+

Group route

+
{{ wp_sharing ? 'Stop sharing' : 'Share my waypoints' }}Your group sees your waypoints on its map (green diamonds) and can follow them.
+
{{ wp_note }}
+
{{ g.name }}{{ g.where }}{{ g.kind == 'following' ? 'Stop following' : 'Follow' }}Following: that pilot's waypoints become yours (and change with theirs) - the HUD shows them.
Click the map to pick a place. Wheel zooms, drag moves, double click opens a system.
diff --git a/EXE/remui/trader.rml b/EXE/remui/trader.rml index 7cd21964..ba0b1768 100644 --- a/EXE/remui/trader.rml +++ b/EXE/remui/trader.rml @@ -67,7 +67,7 @@
Nothing for sale here.
-
+
{{ r.name }}{{ r.count }}{{ r.price }}
@@ -76,17 +76,17 @@

Your cargo

hold {{ hold }}
Your hold carries no goods.
-
+
{{ r.name }}{{ r.note }}{{ r.count }}{{ r.price }}
-

{{ has_pick ? 'Sell ' + dest_good + ' at' : 'Where it sells' }}

known bases
+

{{ has_pick ? 'Sell ' + dest_good + ' at' : 'Where it sells' }}

known bases - right click: price alert
Pick a good to see where it sells and for how much.
No base you know buys it.
-
+
{{ d.name }}{{ d.price }}{{ d.profit }}
{{ d.system }}base price
diff --git a/EXE/rendcomp.dll b/EXE/rendcomp.dll index 90cb4148..8fb2911c 100644 Binary files a/EXE/rendcomp.dll and b/EXE/rendcomp.dll differ diff --git a/EXE/rp8.dll b/EXE/rp8.dll index c496438b..b748e190 100644 Binary files a/EXE/rp8.dll and b/EXE/rp8.dll differ diff --git a/EXE/rpclocal.dll b/EXE/rpclocal.dll index 35aa9595..43bcd125 100644 Binary files a/EXE/rpclocal.dll and b/EXE/rpclocal.dll differ diff --git a/EXE/server.dll b/EXE/server.dll index 8e97f4d2..a661a21b 100644 Binary files a/EXE/server.dll and b/EXE/server.dll differ diff --git a/EXE/shading.dll b/EXE/shading.dll index 2383f14b..53b06cdf 100644 Binary files a/EXE/shading.dll and b/EXE/shading.dll differ diff --git a/EXE/soundmanager.dll b/EXE/soundmanager.dll index 23143146..f12ec7a0 100644 Binary files a/EXE/soundmanager.dll and b/EXE/soundmanager.dll differ diff --git a/EXE/soundstreamer.dll b/EXE/soundstreamer.dll index f3a02e14..384342fd 100644 Binary files a/EXE/soundstreamer.dll and b/EXE/soundstreamer.dll differ diff --git a/EXE/system.dll b/EXE/system.dll index 3b6b5ca1..84b25148 100644 Binary files a/EXE/system.dll and b/EXE/system.dll differ diff --git a/EXE/thorn.dll b/EXE/thorn.dll index ba0dc8ec..86e3a3df 100644 Binary files a/EXE/thorn.dll and b/EXE/thorn.dll differ diff --git a/EXE/x86math.dll b/EXE/x86math.dll index d776e1ca..6581d5ee 100644 Binary files a/EXE/x86math.dll and b/EXE/x86math.dll differ diff --git a/EXE/ximage.dll b/EXE/ximage.dll index e4defefc..f98f274c 100644 Binary files a/EXE/ximage.dll and b/EXE/ximage.dll differ diff --git a/EXE/zlib.dll b/EXE/zlib.dll index 8d541c25..f9c7b2f2 100644 Binary files a/EXE/zlib.dll and b/EXE/zlib.dll differ