diff --git a/DLLS/BIN/content.dll b/DLLS/BIN/content.dll index 6c8557ba..486c2b2b 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 a1661265..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 5da6a2c7..fa8b3c49 100755 Binary files a/EXE/Freelancer.exe and b/EXE/Freelancer.exe differ diff --git a/EXE/alchemy.dll b/EXE/alchemy.dll index 29599df7..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 3df90e1e..459571b9 100644 Binary files a/EXE/common.dll and b/EXE/common.dll differ diff --git a/EXE/dacom.dll b/EXE/dacom.dll index 38da09ce..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 c2376d22..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 c072f413..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 04de095d..c03a75d5 100644 Binary files a/EXE/flmaterials.dll and b/EXE/flmaterials.dll differ diff --git a/EXE/imeui.dll b/EXE/imeui.dll index 1b0416b7..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 37303399..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 95580c09..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 e2535080..38a68a93 100644 Binary files a/EXE/remoteclient.dll and b/EXE/remoteclient.dll differ diff --git a/EXE/remoteserver.dll b/EXE/remoteserver.dll index eea18ef7..141aca2d 100644 Binary files a/EXE/remoteserver.dll and b/EXE/remoteserver.dll differ diff --git a/EXE/remui/hud.rml b/EXE/remui/hud.rml index 759b7494..49d62ab9 100644 --- a/EXE/remui/hud.rml +++ b/EXE/remui/hud.rml @@ -41,18 +41,8 @@ .core .pc { position: absolute; left: 242dp; top: 114dp; width: 136dp; text-align: center; font-weight: 600; font-size: 11dp; letter-spacing: 1dp; } .core .pc .s { color: #4fc6ee; margin-right: 8dp; } .core .pc .h { color: #e0484e; } - .sg2 { position: absolute; } - .ring.sg2 { left: 304.75dp; top: 88.5dp; width: 10.5dp; height: 7dp; background-color: #4fc6ee26; } - .ring.sg2.lit { background-color: #4fc6ee; } - .hring.sg2 { left: 306dp; top: 90.5dp; width: 8dp; height: 3dp; background-color: #e0484e33; } - .hring.sg2.lit { background-color: #e0484e; } - .parc.sg2 { left: 305dp; top: 416dp; width: 10dp; height: 8dp; background-color: #f0943c26; } - .parc.sg2.lit { background-color: #f0943c; } - .tarc.sg2 { left: 305dp; top: 418dp; width: 10dp; height: 4dp; background-color: #dbe6f026; } - .tarc.sg2.lit { background-color: #dbe6f0; } - .tarc.low.sg2.lit { background-color: #ef6a5b; } - .sarc.sg2 { left: 305dp; top: 414dp; width: 10dp; height: 12dp; background-color: #5cc8f026; } - .sarc.sg2.lit { background-color: #5cc8f0; } + /* the segments as soft-edged geometry (: centre, radius and size in dp from the panel's corner) */ + .core segarc { display: block; position: absolute; left: 0; top: 0; width: 1dp; height: 1dp; } .core .side { position: absolute; top: 106dp; width: 180dp; } .core .side.l { left: 50dp; text-align: right; } .core .side.r { left: 390dp; text-align: left; } @@ -62,6 +52,16 @@ .core .big .u { font-weight: 400; font-size: 12dp; color: #8fb3d0; margin-left: 4dp; } .core .pw { display: block; font-weight: 600; font-size: 13dp; color: #f0943c; } .core .pw .cap { color: #f0943c; } + /* the other ship status (REM settings: Ship status "bars"): thrust | shield / hull / power | speed, one panel */ + .fp.coreb { left: 50%; margin-left: -240dp; bottom: 8dp; width: 480dp; height: 66dp; padding: 0 16dp; display: flex; flex-direction: row; align-items: center; } + .coreb .val { width: 76dp; text-align: center; font-weight: 600; font-size: 22dp; color: #e8f4ff; } + .coreb .val .u { font-weight: 400; font-size: 11dp; color: #8fb3d0; margin-left: 4dp; } + .coreb .cap { display: block; font-weight: 600; font-size: 9dp; letter-spacing: 1.5dp; color: #8fb3d0; } + .coreb .thrust.low { color: #ef6a5b; } + .coreb .sep { width: 1dp; height: 42dp; background-color: #2b6f9e; margin: 0 10dp; } + .bars { flex: 1; display: flex; flex-direction: column; justify-content: center; } + .brow { display: flex; flex-direction: row; align-items: center; height: 15dp; } + .brow .l { width: 52dp; font-weight: 600; font-size: 10dp; letter-spacing: 1.5dp; color: #b9d4ea; } .bar { position: relative; flex: 1; height: 8dp; } .chips { position: absolute; left: 0; top: 0; right: 0; height: 8dp; display: flex; flex-direction: row; } .sg { flex: 1; height: 8dp; margin-right: 2dp; } @@ -161,16 +161,17 @@
-
{{ grp[1].shown ? 'Hide' : 'Show' }}Ship status
-
+
{{ grp[1].shown ? 'Hide' : 'Show' }}Ship status
+
{{ grp[1].shown ? 'Hide' : 'Show' }}Ship status
+
-
-
-
-
-
+ + + + +
{{ shield_t }}%{{ hull_t }}%
THRUST{{ thrust }} @@ -181,6 +182,19 @@
+
+
+
THRUST{{ thrust }}
+
+
+
POWER
+
SHIELD
+
HULL
+
+
+
SPEED{{ speed }}m/s
+
+
diff --git a/EXE/rendcomp.dll b/EXE/rendcomp.dll index 9ee106de..7ca9604d 100644 Binary files a/EXE/rendcomp.dll and b/EXE/rendcomp.dll differ diff --git a/EXE/rp8.dll b/EXE/rp8.dll index 26c34b90..3f1c73e1 100644 Binary files a/EXE/rp8.dll and b/EXE/rp8.dll differ diff --git a/EXE/rpclocal.dll b/EXE/rpclocal.dll index 670976b8..88b0ab3b 100644 Binary files a/EXE/rpclocal.dll and b/EXE/rpclocal.dll differ diff --git a/EXE/server.dll b/EXE/server.dll index 56d882d6..df83558e 100644 Binary files a/EXE/server.dll and b/EXE/server.dll differ diff --git a/EXE/shading.dll b/EXE/shading.dll index 37e43819..345fb492 100644 Binary files a/EXE/shading.dll and b/EXE/shading.dll differ diff --git a/EXE/soundmanager.dll b/EXE/soundmanager.dll index 94069727..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 5fae6f7c..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 d7eae574..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 b3331d50..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 7492217e..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 05d5a39b..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 a240bbd1..f9c7b2f2 100644 Binary files a/EXE/zlib.dll and b/EXE/zlib.dll differ