diff --git a/DLLS/BIN/content.dll b/DLLS/BIN/content.dll index 58454b2d..8756eb94 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..e733475e 100644 Binary files a/EXE/DALib.dll and b/EXE/DALib.dll differ diff --git a/EXE/Freelancer.exe b/EXE/Freelancer.exe index c187ea02..6f620618 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..613e8801 100644 Binary files a/EXE/alchemy.dll and b/EXE/alchemy.dll differ diff --git a/EXE/common.dll b/EXE/common.dll index 56fa3d36..7f21ea52 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..bf2d1d95 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..7f45523f 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..8a63cdb7 100644 Binary files a/EXE/engbase.dll and b/EXE/engbase.dll differ diff --git a/EXE/flmaterials.dll b/EXE/flmaterials.dll index dca71747..78ac37cd 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..4b7abfee 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..6ce9b952 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..bab5ecb2 100644 Binary files a/EXE/readfile.dll and b/EXE/readfile.dll differ diff --git a/EXE/remoteclient.dll b/EXE/remoteclient.dll index 6508ca76..52886813 100644 Binary files a/EXE/remoteclient.dll and b/EXE/remoteclient.dll differ diff --git a/EXE/remoteserver.dll b/EXE/remoteserver.dll index b4adf14d..4ef1c518 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 bfa3f114..11089894 100644 --- a/EXE/remui/hud.rml +++ b/EXE/remui/hud.rml @@ -271,7 +271,7 @@
-
+
No target
@@ -320,7 +320,7 @@
{{ battery }}
-
+
{{ w.key + 1 }}{{ w.name }}{{ w.ammo }}
diff --git a/EXE/remui/rem.rcss b/EXE/remui/rem.rcss index 0f78d78b..c14b4aec 100644 --- a/EXE/remui/rem.rcss +++ b/EXE/remui/rem.rcss @@ -423,23 +423,44 @@ input.range sliderarrowdec, input.range sliderarrowinc { width: 0; height: 0; } } .blocked .t { font-family: "Saira SemiCondensed"; font-size: 22dp; color: #dbe6f0; margin-bottom: 6dp; } -/* the running light along an open window's frame (FL's windows have one): four strips the host - adds to every body.window (rem_ui_host.cpp), each lit in turn -- top left to right, right top - to bottom, bottom right to left, left bottom to top */ -@keyframes run-top { 0% { left: 0%; opacity: 0; } 2% { opacity: 1; } 23% { opacity: 1; } 25% { left: 76%; opacity: 0; } 100% { left: 76%; opacity: 0; } } -@keyframes run-right { 0% { top: 0%; opacity: 0; } 25% { top: 0%; opacity: 0; } 27% { opacity: 1; } 48% { opacity: 1; } 50% { top: 76%; opacity: 0; } 100% { top: 76%; opacity: 0; } } -@keyframes run-bottom { 0% { left: 76%; opacity: 0; } 50% { left: 76%; opacity: 0; } 52% { opacity: 1; } 73% { opacity: 1; } 75% { left: 0%; opacity: 0; } 100% { left: 0%; opacity: 0; } } -@keyframes run-left { 0% { top: 76%; opacity: 0; } 75% { top: 76%; opacity: 0; } 77% { opacity: 1; } 98% { opacity: 1; } 100% { top: 0%; opacity: 0; } } -.runner { position: absolute; left: -1dp; top: -1dp; right: -1dp; bottom: -1dp; pointer-events: none; display: none; } -.runner .rt, .runner .rr, .runner .rb, .runner .rl { position: absolute; opacity: 0; } -.runner .rt { top: 0; height: 3dp; width: 24%; left: 0%; decorator: horizontal-gradient(#5cc8f000 #dcf6ff); animation: 8s linear infinite run-top; } -.runner .rr { right: 0; width: 3dp; height: 24%; top: 0%; decorator: vertical-gradient(#5cc8f000 #dcf6ff); animation: 8s linear infinite run-right; } -.runner .rb { bottom: 0; height: 3dp; width: 24%; left: 76%; decorator: horizontal-gradient(#dcf6ff #5cc8f000); animation: 8s linear infinite run-bottom; } -.runner .rl { left: 0; width: 3dp; height: 24%; top: 76%; decorator: vertical-gradient(#dcf6ff #5cc8f000); animation: 8s linear infinite run-left; } -.runner .rt { top: 0; height: 3dp; width: 24%; left: -24%; decorator: horizontal-gradient(#5cc8f000 #dcf6ff); animation: 8s linear infinite run-top; } -.runner .rr { right: 0; width: 3dp; height: 24%; top: -24%; decorator: vertical-gradient(#5cc8f000 #dcf6ff); animation: 8s linear infinite run-right; } -.runner .rb { bottom: 0; height: 3dp; width: 24%; left: 100%; decorator: horizontal-gradient(#dcf6ff #5cc8f000); animation: 8s linear infinite run-bottom; } -.runner .rl { left: 0; width: 3dp; height: 24%; top: 100%; decorator: vertical-gradient(#dcf6ff #5cc8f000); animation: 8s linear infinite run-left; } +/* the windows' calm animation (rem_ui_host.cpp adds .runner with six lights .p1 .. .p6 to every body.window, + the HUD's side panels have their own in hud.rml; the document has its theme's class: theme1 fire, theme2 ice, else the + scan line). Over the window, taking no clicks. */ +@keyframes win-glow { from { opacity: 0.35; } to { opacity: 1; } } +@keyframes win-scan { 0% { top: -120dp; opacity: 0; } 8% { opacity: 1; } 55% { opacity: 1; } 60% { top: 100%; opacity: 0; } 100% { top: 100%; opacity: 0; } } +@keyframes win-ember { 0% { top: 100%; margin-left: 0dp; opacity: 0; } 10% { opacity: 1; } 50% { margin-left: 14dp; } 85% { opacity: 0.7; } 100% { top: 15%; margin-left: -6dp; opacity: 0; } } +@keyframes win-sheen { 0% { left: -40%; } 45% { left: 110%; } 100% { left: 110%; } } +@keyframes win-twinkle { 0% { opacity: 0; transform: scale(0.3); } 6% { opacity: 1; transform: scale(1); } 14% { opacity: 0; transform: scale(0.3); } 100% { opacity: 0; transform: scale(0.3); } } +.runner { position: absolute; left: 6dp; right: 6dp; top: 3dp; bottom: 3dp; overflow: hidden; pointer-events: none; } +.runner div { position: absolute; display: none; pointer-events: none; } +/* (two-colour gradients only: the renderer has no shaders for linear- / radial-gradient) */ +/* standard: a faint line glides down, every 16 s */ +.runner .p1 { display: block; left: 0; right: 0; height: 120dp; top: -120dp; border-bottom: 1dp #dcf6ff38; + decorator: vertical-gradient(#5cc8f000 #5cc8f014); animation: 16s linear infinite win-scan; } +.runner .p2 { display: block; left: 0; right: 0; top: 50%; bottom: 0; decorator: vertical-gradient(#5cc8f000 #5cc8f030); + animation: 6s sine-in-out infinite alternate win-glow; } +/* fire: a red glow from below, five embers rising and drifting */ +.theme1 .runner div { display: block; width: 7dp; height: 7dp; top: 100%; opacity: 0; border-radius: 4dp; + background-color: #ffb040; border: 1dp #fff0c0; decorator: none; } +.theme1 .runner .p1 { left: 12%; right: auto; height: 7dp; border-bottom: 1dp #fff0c0; animation: 9s 0s sine-in-out infinite win-ember; } +.theme1 .runner .p2 { left: 0; right: 0; top: 40%; bottom: 0; width: auto; height: auto; opacity: 1; border-radius: 0; border: 0; + background-color: transparent; decorator: vertical-gradient(#ff3a0000 #ff5a1a50); animation: 6s sine-in-out infinite alternate win-glow; } +.theme1 .runner .p3 { left: 52%; animation: 10s 6s sine-in-out infinite win-ember; } +.theme1 .runner .p4 { left: 70%; width: 5dp; height: 5dp; animation: 13s 1.5s sine-in-out infinite win-ember; } +.theme1 .runner .p5 { left: 86%; animation: 11s 4.5s sine-in-out infinite win-ember; } +.theme1 .runner .p6 { left: 33%; width: 5dp; height: 5dp; animation: 12s 3s sine-in-out infinite win-ember; } +/* ice: a cold light from below, a light edge crossing the window every 10 s, sparkles */ +.theme2 .runner div { display: block; width: 6dp; height: 6dp; opacity: 0; border-radius: 3dp; background-color: #ffffff; + border: 2dp #d6f4ff80; decorator: none; } +.theme2 .runner .p1 { top: 0; bottom: 0; height: auto; left: -40%; right: auto; width: 22%; opacity: 1; border-radius: 0; border: 0; + border-right: 2dp #ffffff50; background-color: transparent; + decorator: horizontal-gradient(#ffffff00 #ffffff22); animation: 10s 1s sine-in-out infinite win-sheen; } +.theme2 .runner .p2 { left: 18%; top: 22%; animation: 7s 0.5s linear infinite win-twinkle; } +.theme2 .runner .p3 { left: 64%; top: 12%; animation: 9s 2.5s linear infinite win-twinkle; } +.theme2 .runner .p4 { left: 82%; top: 58%; animation: 8s 4s linear infinite win-twinkle; } +.theme2 .runner .p5 { left: 38%; top: 74%; animation: 10s 6s linear infinite win-twinkle; } +.theme2 .runner .p6 { left: 0; right: 0; top: 50%; bottom: 0; width: auto; height: auto; opacity: 1; border-radius: 0; border: 0; + background-color: transparent; decorator: vertical-gradient(#cfefff00 #cfefff28); animation: 6s sine-in-out infinite alternate win-glow; } /* a hovered bar icon turning (nnbar, rembar) */ @keyframes nb-spin { from { transform: perspective(240dp) rotateY(0deg) scale(1.12); } to { transform: perspective(240dp) rotateY(360deg) scale(1.12); } } diff --git a/EXE/rendcomp.dll b/EXE/rendcomp.dll index 8fb2911c..51554640 100644 Binary files a/EXE/rendcomp.dll and b/EXE/rendcomp.dll differ diff --git a/EXE/rp8.dll b/EXE/rp8.dll index b748e190..52045680 100644 Binary files a/EXE/rp8.dll and b/EXE/rp8.dll differ diff --git a/EXE/rpclocal.dll b/EXE/rpclocal.dll index 43bcd125..720facf5 100644 Binary files a/EXE/rpclocal.dll and b/EXE/rpclocal.dll differ diff --git a/EXE/server.dll b/EXE/server.dll index a661a21b..deb01e99 100644 Binary files a/EXE/server.dll and b/EXE/server.dll differ diff --git a/EXE/shading.dll b/EXE/shading.dll index 53b06cdf..f80e5161 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..929e7924 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..ac7369bd 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..c1b50a70 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..1be705d1 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..b1c31140 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..9e8a40de 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..23802ac2 100644 Binary files a/EXE/zlib.dll and b/EXE/zlib.dll differ