diff --git a/DLLS/BIN/content.dll b/DLLS/BIN/content.dll index b9aec915..a62d3fab 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 e3a6a84c..b2e146e1 100644 Binary files a/EXE/DALib.dll and b/EXE/DALib.dll differ diff --git a/EXE/Freelancer.exe b/EXE/Freelancer.exe index 155e2855..2bff2f62 100755 Binary files a/EXE/Freelancer.exe and b/EXE/Freelancer.exe differ diff --git a/EXE/alchemy.dll b/EXE/alchemy.dll index 3aef4b60..f0e4e205 100644 Binary files a/EXE/alchemy.dll and b/EXE/alchemy.dll differ diff --git a/EXE/common.dll b/EXE/common.dll index 878b77c3..25c5d047 100644 Binary files a/EXE/common.dll and b/EXE/common.dll differ diff --git a/EXE/dacom.dll b/EXE/dacom.dll index b7ff03a9..1b413cbf 100644 Binary files a/EXE/dacom.dll and b/EXE/dacom.dll differ diff --git a/EXE/deformable2.dll b/EXE/deformable2.dll index 38c567eb..8a0ff188 100644 Binary files a/EXE/deformable2.dll and b/EXE/deformable2.dll differ diff --git a/EXE/engbase.dll b/EXE/engbase.dll index 75cc0f2a..999ceba7 100644 Binary files a/EXE/engbase.dll and b/EXE/engbase.dll differ diff --git a/EXE/flmaterials.dll b/EXE/flmaterials.dll index c03a75d5..3e4e0846 100644 Binary files a/EXE/flmaterials.dll and b/EXE/flmaterials.dll differ diff --git a/EXE/imeui.dll b/EXE/imeui.dll index 0de0400a..d7fdcc9c 100644 Binary files a/EXE/imeui.dll and b/EXE/imeui.dll differ diff --git a/EXE/luaprofile.dll b/EXE/luaprofile.dll index 23b519c9..a569b056 100644 Binary files a/EXE/luaprofile.dll and b/EXE/luaprofile.dll differ diff --git a/EXE/readfile.dll b/EXE/readfile.dll index 84efa18c..756ae1b5 100644 Binary files a/EXE/readfile.dll and b/EXE/readfile.dll differ diff --git a/EXE/remoteclient.dll b/EXE/remoteclient.dll index 38a68a93..4d03353c 100644 Binary files a/EXE/remoteclient.dll and b/EXE/remoteclient.dll differ diff --git a/EXE/remoteserver.dll b/EXE/remoteserver.dll index 141aca2d..a12fa087 100644 Binary files a/EXE/remoteserver.dll and b/EXE/remoteserver.dll differ diff --git a/EXE/remui/loadgame.rml b/EXE/remui/loadgame.rml index cb442f2d..785c66b8 100644 --- a/EXE/remui/loadgame.rml +++ b/EXE/remui/loadgame.rml @@ -30,7 +30,7 @@
No saved games.
-
+
{{ s.name }}{{ s.time }}
diff --git a/EXE/remui/loadsave.rml b/EXE/remui/loadsave.rml index fcec9f30..147e1146 100644 --- a/EXE/remui/loadsave.rml +++ b/EXE/remui/loadsave.rml @@ -30,7 +30,7 @@
NameSaved
No saved games.
-
+
{{ s.name }}{{ s.time }}
diff --git a/EXE/remui/missionboard.rml b/EXE/remui/missionboard.rml index 77a28f8d..f38db089 100644 --- a/EXE/remui/missionboard.rml +++ b/EXE/remui/missionboard.rml @@ -48,7 +48,7 @@

Offers

-
+
{{ o.title }}
{{ o.text }}
{{ o.reward }} diff --git a/EXE/remui/navbar.rml b/EXE/remui/navbar.rml index 91ceb776..c6ff5ced 100644 --- a/EXE/remui/navbar.rml +++ b/EXE/remui/navbar.rml @@ -11,23 +11,28 @@ top: 4dp; width: auto; transform: translateX(-50%); - display: block; + display: flex; + flex-direction: column; + align-items: center; background-color: transparent; } - /* in the flight HUD's design: one frame with cut corners (rem.rcss, hudframes), no box per button */ - .navbar { display: flex; flex-direction: row; align-items: center; height: 48dp; box-sizing: border-box; padding: 0 18dp; decorator: ninepatch(fb, fb-i); } - .nb { display: flex; flex-direction: row; align-items: center; height: 36dp; padding: 0 12dp 0 8dp; margin: 0 1dp; border-radius: 3dp; } - .nb:hover { background-color: #5cc8f01a; } + /* in the flight HUD's design, as its maneuver bar (hud.rml .mans): one frame with cut corners + (rem.rcss, hudframes), icon over its name, a thin line between, the active one amber */ + .navbar { display: flex; flex-direction: row; align-items: center; height: 76dp; box-sizing: border-box; padding: 0 18dp; decorator: ninepatch(fb, fb-i); } + .nb { display: flex; flex-direction: column; align-items: center; justify-content: center; min-width: 84dp; height: 62dp; padding: 0 10dp; border-left: 1dp #2b6f9e; } + .nb:first-child, .nb.active { border-left-width: 0; } + .nb:hover { background-color: #f2b13c14; } .nb.active { background-color: #f2b13c1f; } - .nb.disabled { opacity: 0.4; } + .nb.disabled { opacity: 0.35; } .nb.disabled:hover { background-color: transparent; } - .nb img { width: 28dp; height: 28dp; margin-right: 6dp; } - .nb span { font-family: "Saira SemiCondensed"; font-weight: 600; font-size: 13dp; letter-spacing: 1.5dp; text-transform: uppercase; color: #e8f4ff; } + .nb img { width: 34dp; height: 34dp; } + .nb:hover img, .nb.active img { image-color: #f2b13c; } + .nb span { margin-top: 2dp; font-family: "Saira SemiCondensed"; font-weight: 600; font-size: 12dp; letter-spacing: 1dp; text-transform: uppercase; white-space: nowrap; color: #b9d4ea; } .nb.active span { color: #f2b13c; } - .nb:hover span { color: #5cc8f0; } - .nb.tab img { width: 22dp; height: 22dp; } - .nb.tab span { font-size: 12dp; color: #b9d4ea; } - .sep { width: 1dp; height: 28dp; background-color: #2b6f9e; margin: 0 8dp; } + /* the room's services (repair, launch, the dealer's desk, ...) in a smaller second row under it */ + .navbar.tabs { height: 56dp; margin-top: 4dp; padding: 0 14dp; } + .tabs .nb { min-width: 72dp; height: 46dp; } + .tabs .nb img { width: 26dp; height: 26dp; } @@ -35,8 +40,9 @@
{{ b.label }}
-
-
+
+
+
{{ b.label }}
diff --git a/EXE/remui/outfitter.rml b/EXE/remui/outfitter.rml index 96672254..f0677fdc 100644 --- a/EXE/remui/outfitter.rml +++ b/EXE/remui/outfitter.rml @@ -59,6 +59,27 @@ .panel .pfoot { display: flex; flex-direction: row; margin-top: 10dp; } .panel .pfoot .btn { margin: 0 8dp 0 0; padding: 3dp 10dp; } .content { position: relative; } + /* hold and credits in the tabs' row, large: the hold a bar that fills with the load, amber from 3/4, red full */ + .stat { display: flex; flex-direction: row; align-items: center; align-self: center; margin-left: 24dp; } + .stat .sk { margin-right: 10dp; font-family: "Saira SemiCondensed"; font-weight: 600; font-size: 12dp; letter-spacing: 2dp; color: #8197ad; } + .stat .sv { font-family: "IBM Plex Mono"; font-size: 20dp; color: #f2b13c; } + .hbar { position: relative; width: 200dp; height: 24dp; border: 1dp #2b6f9e; background-color: #00000066; } + .hbar .hf { position: absolute; left: 0; top: 0; bottom: 0; background-color: #3a8fc899; } + .hbar .hf.warn { background-color: #f2b13c99; } + .hbar .hf.bad { background-color: #ef6a5bcc; } + .hbar .ht { position: relative; display: block; line-height: 24dp; text-align: center; font-family: "IBM Plex Mono"; font-size: 15dp; color: #e8f4ff; } + /* your equipment in three parts: the ship's hardpoints (what sits on each, the empty ones dim), what is + mounted without a hardpoint, the hold -- not mounted, an amber edge */ + .sec { display: flex; flex-direction: row; align-items: center; margin: 12dp 0 4dp 0; padding-bottom: 3dp; border-bottom: 1dp #2b6f9e; font-family: "Saira SemiCondensed"; font-weight: 600; font-size: 12dp; letter-spacing: 2dp; color: #5cc8f0; } + .sec:first-child { margin-top: 0; } + .sec .cnt { margin-left: auto; font-family: "IBM Plex Mono"; font-weight: 400; letter-spacing: 0; color: #8197ad; } + .sec.held { color: #f2b13c; border-bottom-color: #f2b13c66; } + .good .slot { font-family: "Saira SemiCondensed"; font-weight: 600; font-size: 10dp; letter-spacing: 1dp; text-transform: uppercase; white-space: nowrap; color: #8fb3d0; } + .good.empty .n { color: #5c7a94; } + .good.empty .txt { margin-left: 40dp; } /* in line with the rows that have an icon (30 + 10 dp) */ + .good.held { border-left-color: #f2b13c66; } + .good.held.selected { border-left-color: #f2b13c; } + .good.held .note { color: #5fd08a; } @@ -66,8 +87,6 @@ EQUIPMENT DEALER\\\ - Hold {{ hold }} - Credits {{ credits }} {{ tax }}
The server takes this share of what you sell to the base. It follows the region's trade of the last days: the busiest region pays the most.
 ×
@@ -79,6 +98,8 @@
Ammo
Equipment
Cargo bay
+
HOLD
{{ hold }}
+
CREDITS{{ credits }}
@@ -88,7 +109,7 @@
No equipment for sale here.
-
+
{{ r.name }}
{{ r.note }}
{{ r.price }} @@ -113,10 +134,23 @@
-
No equipment.
-
+
HARDPOINTS{{ hp_used }} / {{ hps.size }}
+
-
{{ r.name }}
{{ r.note }}
+
{{ r.key == '' ? 'empty' : r.name }}
{{ r.slot }}
+ {{ r.price }} +
+
MOUNTED, NO HARDPOINT
+
+ +
{{ r.name }}
+ {{ r.count }}{{ r.price }} +
+
CARGO HOLD · NOT MOUNTED{{ hold }}
+
Nothing in the hold.
+
+ +
{{ r.name }}
{{ r.note }}
{{ r.count }}{{ r.price }}
diff --git a/EXE/remui/repair.rml b/EXE/remui/repair.rml index d0fe8e69..dae63432 100644 --- a/EXE/remui/repair.rml +++ b/EXE/remui/repair.rml @@ -18,7 +18,7 @@ .sum { display: flex; flex-direction: row; align-items: center; border-top: 1dp #24405c; padding-top: 12dp; margin-top: 8dp; } .sum .k { font-family: "Saira SemiCondensed"; letter-spacing: 1.1dp; text-transform: uppercase; color: #8197ad; margin-right: 10dp; } .sum .v { font-family: "IBM Plex Mono"; font-size: 20dp; color: #f2b13c; margin-right: 24dp; } - .sum .btn { margin: 0 0 0 auto; } + .go { margin: 12dp 0 0 0; padding: 10dp 16dp; text-align: center; font-size: 16dp; } /* the whole width under the total */ .warn { color: #ef6a5b; margin-right: 14dp; } @@ -50,8 +50,8 @@
Total{{ total }} Not enough credits -
Repair
Repairs the checked parts and pays the total.
+
Repair
Repairs the checked parts and pays the total.
diff --git a/EXE/remui/shop.rml b/EXE/remui/shop.rml index 14e2d467..1c470068 100644 --- a/EXE/remui/shop.rml +++ b/EXE/remui/shop.rml @@ -101,7 +101,7 @@
{{ empty }}
-
+
{{ c.qty }} {{ c.badge }} diff --git a/EXE/remui/tooltip.rml b/EXE/remui/tooltip.rml index 7fe371a1..df65350e 100644 --- a/EXE/remui/tooltip.rml +++ b/EXE/remui/tooltip.rml @@ -17,7 +17,7 @@ } /* the rollover help ("Click on a character ..."): centred under the nav bar at the top, in the flight HUD's frame -- not at the classic point, where it lay over the nav bar */ - .ftip.roll { left: 50%; top: 58dp; transform: translateX(-50%); max-width: 640dp; padding: 8dp 20dp; font-size: 14dp; text-align: center; white-space: pre-line; } + .ftip.roll { left: 50%; top: 144dp; transform: translateX(-50%); max-width: 640dp; padding: 8dp 20dp; font-size: 14dp; text-align: center; white-space: pre-line; } /* a REM window's .tip (the hovered element's), drawn here so no other window covers it */ .ftip.hov { width: 260dp; white-space: normal; font-family: Barlow; } diff --git a/EXE/remui/trader.rml b/EXE/remui/trader.rml index 1e727629..b021a59e 100644 --- a/EXE/remui/trader.rml +++ b/EXE/remui/trader.rml @@ -48,7 +48,7 @@
Nothing for sale here.
-
+
{{ r.name }}{{ r.count }}{{ r.price }}
@@ -57,7 +57,7 @@

Your cargo

hold {{ hold }}
Your hold carries no goods.
-
+
{{ r.name }}{{ r.note }}{{ r.count }}{{ r.price }}
diff --git a/EXE/rendcomp.dll b/EXE/rendcomp.dll index 7ca9604d..098a2633 100644 Binary files a/EXE/rendcomp.dll and b/EXE/rendcomp.dll differ diff --git a/EXE/rp8.dll b/EXE/rp8.dll index 035c91f5..30cf9589 100644 Binary files a/EXE/rp8.dll and b/EXE/rp8.dll differ diff --git a/EXE/rpclocal.dll b/EXE/rpclocal.dll index 88b0ab3b..05676f71 100644 Binary files a/EXE/rpclocal.dll and b/EXE/rpclocal.dll differ diff --git a/EXE/server.dll b/EXE/server.dll index f1b46cef..53fa33e5 100644 Binary files a/EXE/server.dll and b/EXE/server.dll differ diff --git a/EXE/shading.dll b/EXE/shading.dll index 345fb492..5f4fa3cb 100644 Binary files a/EXE/shading.dll and b/EXE/shading.dll differ diff --git a/EXE/soundmanager.dll b/EXE/soundmanager.dll index f12ec7a0..3a7f3571 100644 Binary files a/EXE/soundmanager.dll and b/EXE/soundmanager.dll differ diff --git a/EXE/soundstreamer.dll b/EXE/soundstreamer.dll index 384342fd..3596ad06 100644 Binary files a/EXE/soundstreamer.dll and b/EXE/soundstreamer.dll differ diff --git a/EXE/system.dll b/EXE/system.dll index 84b25148..a9b5741d 100644 Binary files a/EXE/system.dll and b/EXE/system.dll differ diff --git a/EXE/thorn.dll b/EXE/thorn.dll index 86e3a3df..d4aee2ee 100644 Binary files a/EXE/thorn.dll and b/EXE/thorn.dll differ diff --git a/EXE/x86math.dll b/EXE/x86math.dll index 6581d5ee..e29f167d 100644 Binary files a/EXE/x86math.dll and b/EXE/x86math.dll differ diff --git a/EXE/ximage.dll b/EXE/ximage.dll index f98f274c..483411fa 100644 Binary files a/EXE/ximage.dll and b/EXE/ximage.dll differ diff --git a/EXE/zlib.dll b/EXE/zlib.dll index f9c7b2f2..435fd438 100644 Binary files a/EXE/zlib.dll and b/EXE/zlib.dll differ