diff --git a/DLLS/BIN/content.dll b/DLLS/BIN/content.dll index 27d04b3b..4f140ebf 100644 Binary files a/DLLS/BIN/content.dll and b/DLLS/BIN/content.dll differ diff --git a/EXE/Freelancer.exe b/EXE/Freelancer.exe index 2f12d9fa..19760966 100644 Binary files a/EXE/Freelancer.exe and b/EXE/Freelancer.exe differ diff --git a/EXE/common.dll b/EXE/common.dll index 3ec81085..acc86fb1 100644 Binary files a/EXE/common.dll and b/EXE/common.dll differ diff --git a/EXE/flmaterials.dll b/EXE/flmaterials.dll index 8bd8becc..c03a75d5 100644 Binary files a/EXE/flmaterials.dll and b/EXE/flmaterials.dll differ diff --git a/EXE/remgfx.ini b/EXE/remgfx.ini index f72f781b..3bf538d1 100644 --- a/EXE/remgfx.ini +++ b/EXE/remgfx.ini @@ -89,6 +89,10 @@ Overlay = 1 ; R4 sun shadows in space and space cutscenes (cascaded shadow maps): ShadowMapSize is the atlas ; of the four cascades (2048 / 4096 / 8192), ShadowDistance how far from the camera (metres). Shadows = 1 +; R32 soft shadow-map shadows (PCSS): the sun's angular size in degrees -- sharp where a shadow touches +; its caster, softer farther away (0 = the fixed 3x3 filter). The ray-traced shadows (RtShadows) are +; not affected. +ShadowSoftness = 1.5 ShadowMapSize = 4096 ShadowDistance = 3000 ; PlanetShadows = 1: planets also receive the shadows of ships, docking rings and stations @@ -102,11 +106,13 @@ ShadowCullMargin = 400 DynamicLights = 1 ; R17 weapon lights: laser beams light their surroundings along their length, muzzle flashes, ; projectiles, impacts and explosions as points in the colour of their particles (needs -; DynamicLights = 1). WeaponGlow draws weapon effects brighter for the bloom (1 = original). +; DynamicLights = 1). WeaponGlow draws weapon effects brighter for the bloom (1 = original, below 1 +; dimmer); BeamGlow the lasers' glowing volumes (R24, 0 = off). WeaponLights = 1 WeaponLightIntensity = 1.0 WeaponLightRange = 1.0 -WeaponGlow = 1.6 +WeaponGlow = 1.0 +BeamGlow = 0.4 ; R2 debug view (diagnosis from screenshots): 0 off, 1 normals, 2 depth (1 m black .. 130 km ; white), 3 motion vectors (grey = still, magenta = unknown), 4 material class (glass, nomad, ; planet water, engine glow ... one colour each), 5 game object (one colour per object), 6 phase diff --git a/EXE/remoteclient.dll b/EXE/remoteclient.dll index 59c0eb60..ab423d9c 100644 Binary files a/EXE/remoteclient.dll and b/EXE/remoteclient.dll differ diff --git a/EXE/remoteserver.dll b/EXE/remoteserver.dll index a9494ddc..ce68f865 100644 Binary files a/EXE/remoteserver.dll and b/EXE/remoteserver.dll differ diff --git a/EXE/remui/admin.rml b/EXE/remui/admin.rml new file mode 100644 index 00000000..befe91b9 --- /dev/null +++ b/EXE/remui/admin.rml @@ -0,0 +1,62 @@ + + + Admin + + + + +
+ + ADMIN + + {{ commands.size }} commands + × +
+
+
+
+
+ +
+
{{ received ? 'No command matches.' : 'Asking the server...' }}
+
{{ c.name }}
+
+
+
+
+
{{ has_pick ? pick_name : 'Pick a command' }}
+
{{ has_pick ? pick_help : 'Every admin command of the server, run from here - its answer comes in the chat.' }}
+
+
Arguments
+
+ +
Run
Runs the command on the server as you typed it; the answer comes as a system message in the chat.
+
+
+
Run here
+
{{ r }}
+
+
+
+
+
+
+ Escclose +
+ + diff --git a/EXE/remui/base.rml b/EXE/remui/base.rml index 4544714a..21fd1fed 100644 --- a/EXE/remui/base.rml +++ b/EXE/remui/base.rml @@ -503,11 +503,11 @@
-
To your depot on
+
To your depot onFee
You have no other depot.
- {{ r.a }} + {{ r.a }}{{ r.b }}
@@ -519,7 +519,7 @@
{{ courier_msg }}
-
Send couriers
The cargo leaves your depot now; couriers fly it to the depot you picked (several when it does not fit one hold).
+
Send couriers
The cargo leaves your depot now; couriers fly it to the depot you picked (several when it does not fit one hold). The fee is paid from your credits.
diff --git a/EXE/remui/hud.rml b/EXE/remui/hud.rml index e75ccbe7..aa69c76f 100644 --- a/EXE/remui/hud.rml +++ b/EXE/remui/hud.rml @@ -31,13 +31,13 @@ .chips { position: absolute; left: 0; top: 0; width: 242dp; height: 11dp; display: flex; flex-direction: row; } .sg { flex: 1; height: 11dp; margin-right: 2dp; } .sg:last-child { margin-right: 0; } - .fillbox { position: absolute; left: 0; top: 0; height: 11dp; overflow: hidden; } - .power .chips.dim .sg { background-color: #a7a15e33; } - .power .fillbox .sg { background-color: #c9c272; } - .shield .chips.dim .sg { background-color: #3e3db544; } - .shield .fillbox .sg { background-color: #5856dc; } - .hull .chips.dim .sg { background-color: #782a3355; } - .hull .fillbox .sg { background-color: #b53844; } + /* each segment lit by the value (no clipped fill row: the HUD's scaled parts are not clipped) */ + .power .sg { background-color: #a7a15e33; } + .power .sg.lit { background-color: #c9c272; } + .shield .sg { background-color: #3e3db544; } + .shield .sg.lit { background-color: #5856dc; } + .hull .sg { background-color: #782a3355; } + .hull .sg.lit { background-color: #b53844; } /* --- bottom left: target / contacts --------------------------------------------------- */ .lhead { left: 46dp; bottom: 289dp; width: 291dp; height: 52dp; display: flex; flex-direction: row; align-items: center; padding: 0 6dp 0 10dp; } @@ -70,6 +70,8 @@ .w.on { color: #7cf27c; } .w .n { flex: 1; white-space: nowrap; overflow: hidden; } .w .a { margin-left: 8dp; } + .w.cloak { border-top: 1dp #24405c; margin-top: 4dp; color: #8fb8d8; } + .w.cloak.on { color: #b98cf2; } .special { color: #f2d23c; font-size: 18dp; margin-top: 6dp; } /* the HUD editor: four layers over the whole screen, each moved / sized as one */ .grp { position: absolute; left: 0; top: 0; width: 100%; height: 100%; pointer-events: none; } @@ -110,9 +112,9 @@
{{ thrust }}
-
-
-
+
+
+
{{ speed }}
@@ -132,8 +134,8 @@
{{ target_name }}
{{ target_sub }} {{ target_rank }} {{ target_range }}
-
Hull
-
Shield
+
Hull
+
Shield
@@ -171,6 +173,7 @@
{{ w.key + 1 }} {{ w.name }}{{ w.ammo }}
+
{{ cloak_name }}{{ cloak_on ? 'ON' : 'OFF' }}
{{ special }}
diff --git a/EXE/remui/loading.rml b/EXE/remui/loading.rml index e68bb666..27282b59 100644 --- a/EXE/remui/loading.rml +++ b/EXE/remui/loading.rml @@ -3,7 +3,7 @@ Loading + + +
+ + MARKET + {{ here }} + + {{ fees }}
Broker fee: from your bank when you place an order or give it a new price. Sales tax: from what you get for a sale. Orders end after their days: goods back into the depot, escrow back to the bank.
 + × +
+
+
+
+
Market
+
My orders
+
Refresh
+
+ + +
+
+
+ + with orders
Only goods somebody offers or wants. Off: every commodity, to place a buy order for it.
 +
+
GoodsellbuyNPC
+
+
{{ received ? 'No good matches.' : 'Asking the server...' }}
+
+ {{ r.name }}{{ r.sell }}{{ r.buy }}{{ r.npc }} +
+
+
+
+
+ {{ has_item ? item_name : 'Pick a good' }} + {{ item_npc }} +
+
+ 30 days + 90 days + all regions + {{ here_region != '' ? here_region : 'this region' }} + market meanlow - highNPC pricevolume +
+
+ {{ chart_hi }} + {{ chart_lo }} +
+
+
+
+
+
+
+
{{ b.tip }}
+
+
{{ chart_note }}
+
+
+
+
+
{{ chart_from }}{{ chart_to }}
+ +
+
+
Sell orders - buy from them
+
+
Basejumpsqtyprice
+
+
Nobody sells this. Place a buy order.
+
+ {{ r.base }}{{ r.jumps }}{{ r.qty }}{{ r.price }} +
{{ r.who }} - ends in {{ r.expires }}{{ r.mine ? ' - your order' : '' }}
+
+
+
+
+
+
Buy orders - sell into them
+
+
Basejumpsqtyprice
+
+
Nobody wants this yet. Place a sell order.
+
+ {{ r.base }}{{ r.jumps }}{{ r.qty }}{{ r.price }} +
{{ r.who }} - ends in {{ r.expires }}{{ r.mine ? ' - your order' : '' }}
+
+
+
+
+
+ +
+
{{ pick_text }}
+
+ + {{ amount_text }} +
Max
+ {{ deal_total }} +
{{ pick_buy ? 'Sell' : 'Buy' }}
{{ pick_buy ? 'Sells from your depot on that base into the buy order; the credits go to your bank.' : 'Buys with your bank credits; the goods go into your depot on that base.' }}
+
+
+ +
+
+ Sell order + Buy order + {{ place_have }} +
+
+ Amount + Price / unit + Days +
Place
Sell order: the goods leave your depot here and wait on the market. Buy order: the credits wait in escrow; what is sold into it goes into your depot here.
+
+
{{ place_info }}
+
+ +
{{ status }}
+
+
+ + +
+
Your orders
+
+
KindGoodBaseqtypriceends in
+
+
You have no orders on the market.
+
+ {{ r.kind }}{{ r.item }}{{ r.base }} + {{ r.qty }}{{ r.price }}{{ r.expires }} +
+
+
+
+
+ New price +
Set price
A new price per unit; the broker fee is charged again. A buy order's escrow follows the price.
+
Take back
Sell order: the goods go back into your depot on that base. Buy order: the escrow goes back to your bank.
+
+
+
{{ status }}
+
Your last trades
+
+
WhenSideGoodqtypriceBase
+
+
No trades yet.
+
+ {{ r.when }}{{ r.side }}{{ r.item }} + {{ r.qty }}{{ r.price }}{{ r.base }} +
+
+
+
+
+
+
+ Escclose +
+ + diff --git a/EXE/remui/navmap.rml b/EXE/remui/navmap.rml index b25db823..43ef64eb 100644 --- a/EXE/remui/navmap.rml +++ b/EXE/remui/navmap.rml @@ -79,6 +79,13 @@ .ln.lane { border-top: 3dp #2f6d8f; } .ln.route { border-top: 3dp #5cc8f0; } .ln.waypath { border-top: 3dp #f2b13c; } + + /* the original's look (player's wish): lanes, jump links, the route and every marker are drawn by + the original map under the box (NeuroNetNavMap::RemDrawBackground); ours stay as names, the + selection ring and the bookmarks (REM's own) */ + .ln { display: none; } + .mi .s { opacity: 0; } + .bookmark .s { opacity: 1; } diff --git a/EXE/remui/nnbar.rml b/EXE/remui/nnbar.rml index dc533742..80cf5e0e 100644 --- a/EXE/remui/nnbar.rml +++ b/EXE/remui/nnbar.rml @@ -16,7 +16,6 @@ .nb img { transform: perspective(240dp) rotateY(0deg) scale(1); transition: transform 0.2s cubic-out; } .nb.active img { image-color: #f2b13c; } .nb .tip { top: 40dp; right: 0; left: auto; bottom: auto; width: 230dp; white-space: normal; text-align: right; } - .nb:hover .tip { display: block; } diff --git a/EXE/remui/objective.rml b/EXE/remui/objective.rml index 5a457c3c..34036ae3 100644 --- a/EXE/remui/objective.rml +++ b/EXE/remui/objective.rml @@ -3,14 +3,13 @@ Objective diff --git a/EXE/remui/options.rml b/EXE/remui/options.rml index eda97be1..1e31de81 100644 --- a/EXE/remui/options.rml +++ b/EXE/remui/options.rml @@ -32,7 +32,9 @@ .slide { display: flex; flex-direction: row; align-items: center; width: 330dp; } .slide .step { width: 26dp; padding: 2dp 0; text-align: center; border: 1dp #24405c; border-radius: 3dp; color: #dbe6f0; } .slide .step:hover { border-color: #5cc8f0; color: #5cc8f0; } - .slide .track { flex: 1; height: 6dp; margin: 0 8dp; background-color: #24405c; border-radius: 3dp; } + .slide .track { flex: 1; height: 18dp; margin: 0 8dp; padding: 6dp 0; cursor: pointer; } + .slide .rail { height: 6dp; background-color: #24405c; border-radius: 3dp; } + .slide .track:hover .rail { background-color: #2e5378; } .slide .fill { height: 6dp; background-color: #f2b13c; border-radius: 3dp; } .opt .v { width: 120dp; text-align: right; font-family: "IBM Plex Mono"; font-size: 12dp; color: #8197ad; margin-left: 10dp; } .ask { padding: 12dp; margin-bottom: 12dp; border: 1dp #24405c; border-left: 3dp #f2b13c; border-radius: 3dp; background-color: #0d1622; display: flex; flex-direction: row; align-items: center; } @@ -91,7 +93,7 @@
{{ r.value }}
- -
+
+ {{ r.value }}
diff --git a/EXE/remui/outfitter.rml b/EXE/remui/outfitter.rml index b1a5d09c..2dbb11cf 100644 --- a/EXE/remui/outfitter.rml +++ b/EXE/remui/outfitter.rml @@ -40,6 +40,25 @@ .cmp .cv.down { color: #ef6a5b; } .cmp .cv.dim { color: #8197ad; } .cmp .cn { margin-top: 4dp; font-size: 12dp; color: #8197ad; } + .col-h .tools { margin-left: auto; display: flex; flex-direction: row; align-items: center; } + .col-h .tools .btn { margin: 0 0 0 8dp; padding: 3dp 10dp; } + .switch { width: 58dp; padding: 3dp 0; text-align: center; border: 2dp #3d6d96; border-radius: 4dp; font-family: "Saira SemiCondensed"; font-weight: 600; font-size: 13dp; letter-spacing: 1dp; color: #8197ad; } + .switch.on { border-color: #f2b13c; color: #f2b13c; background-color: #f2b13c1f; } + .switch:hover { border-color: #5cc8f0; } + .flag { display: flex; flex-direction: row; align-items: center; font-size: 13dp; color: #b8c4cc; } + .flag .switch { width: 44dp; margin-right: 6dp; } + .gear { font-size: 16dp; } + .panel { position: absolute; top: 60dp; width: 420dp; max-height: 70%; display: flex; flex-direction: column; padding: 14dp; border: 1dp #f2b13c; border-radius: 3dp; background-color: #0b1320f4; z-index: 10; } + .panel.left { left: 24dp; } + .panel.right { right: 24dp; } + .panel h3 { margin-bottom: 4dp; } + .panel .pnote { font-size: 12dp; color: #8197ad; margin-bottom: 10dp; } + .panel .plist { flex: 1 1 auto; min-height: 0; overflow-y: auto; border: 1dp #24405c; border-radius: 3dp; } + .panel .prow { display: flex; flex-direction: row; align-items: center; padding: 5dp 10dp; border-bottom: 1dp #ffffff08; } + .panel .prow .n { flex: 1; min-width: 0; } + .panel .pfoot { display: flex; flex-direction: row; margin-top: 10dp; } + .panel .pfoot .btn { margin: 0 8dp 0 0; padding: 3dp 10dp; } + .content { position: relative; } @@ -49,13 +68,23 @@ 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.
 ×
+
+
All
+
Weapons
+
Ammo
+
Equipment
+
Cargo bay
+
-

For sale here

{{ market.size }}
+

For sale here

{{ market.size }} +
⚙ Autobuy
What the server buys by itself when you dock: ammunition for your launchers, nanobots and shield batteries.
 +
No equipment for sale here.
@@ -76,7 +105,13 @@
-

Your equipment

hold {{ hold }}
+

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.
 +
Sell all loot ({{ loot_count }})
Sells everything that came aboard since you last launched (loot), except what you keep (the gear button).
+
⚙
What "Sell all loot" keeps.
+ +
No equipment.
@@ -87,6 +122,24 @@
+
+

AUTOBUY

+
Bought by itself when you dock, where the base sells it, as far as hold and credits go (also /autobuy in the chat).
+
This server sends no autobuy settings.
+
+
{{ r.name }}
{{ r.on ? 'ON' : 'OFF' }}
+
+
All on
All off
Close
+
+
+

KEEP LOOT

+
"Sell all loot" sells everything that came aboard since you launched; what is set to KEEP here stays in the hold.
+
+
No equipment in the hold.
+
{{ r.name }}
{{ r.on ? 'KEEP' : 'SELL' }}
+
+
Close
+
@@ -100,6 +153,7 @@
{{ reason }} {{ total }} + {{ tax_note }}
{{ mount_label }}
{{ mount_tip }}
{{ side == 0 ? 'Buy' : 'Sell' }}
{{ side == 0 ? 'Buys it: onto a free hardpoint of your ship when there is one, else into the hold.' : 'Sells it; used equipment fetches less.' }}
diff --git a/EXE/remui/radar.rml b/EXE/remui/radar.rml index 2b18f684..5907cc8e 100644 --- a/EXE/remui/radar.rml +++ b/EXE/remui/radar.rml @@ -3,9 +3,10 @@ Radar @@ -26,7 +27,9 @@
RADAR{{ count }} + MISSILE + {{ projection == 1 ? '3D' : 'TOP' }} 2.5K 5K 7.5K diff --git a/EXE/remui/rem.rcss b/EXE/remui/rem.rcss index 859b05ea..b3f6dbe9 100644 --- a/EXE/remui/rem.rcss +++ b/EXE/remui/rem.rcss @@ -274,7 +274,8 @@ h3, .label border-radius: 3dp; padding: 6dp 9dp; } -.btn:hover .tip { display: block; } +/* shown by the tool tip window over every window (rem_ui_tooltip.cpp), not here: inside its own + document another window could cover it */ .actions { display: flex; flex-direction: row; flex-wrap: wrap; } diff --git a/EXE/remui/rembar.rml b/EXE/remui/rembar.rml index 9def3d3f..b59532d8 100644 --- a/EXE/remui/rembar.rml +++ b/EXE/remui/rembar.rml @@ -16,7 +16,6 @@ .nb img { transform: perspective(240dp) rotateY(0deg) scale(1); transition: transform 0.2s cubic-out; } .nb.active img { image-color: #f2b13c; } .nb .tip { top: 40dp; left: 0; right: auto; bottom: auto; width: 230dp; white-space: normal; } - .nb:hover .tip { display: block; } diff --git a/EXE/remui/tooltip.rml b/EXE/remui/tooltip.rml index 858a44d3..60a3a1c9 100644 --- a/EXE/remui/tooltip.rml +++ b/EXE/remui/tooltip.rml @@ -19,10 +19,13 @@ white-space: nowrap; } .ftip.roll { border-left-color: #5cc8f0; font-size: 14dp; 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; background-color: #05090f; border-left: 2dp #3d6d96; }
{{ tip_text }}
{{ roll_text }}
+
diff --git a/EXE/remui/trader.rml b/EXE/remui/trader.rml index b26b1134..52828faf 100644 --- a/EXE/remui/trader.rml +++ b/EXE/remui/trader.rml @@ -37,6 +37,7 @@ 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.
 ×
@@ -75,6 +76,7 @@
{{ reason }} {{ total }} + {{ tax_note }}
{{ side == 0 ? 'Buy' : 'Sell' }}
{{ side == 0 ? 'Buys the amount into your cargo hold.' : 'Sells the amount from your cargo hold.' }}
diff --git a/EXE/rendcomp.dll b/EXE/rendcomp.dll index 79e42398..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 d888146b..812b5acc 100644 Binary files a/EXE/rp8.dll and b/EXE/rp8.dll differ diff --git a/EXE/rpclocal.dll b/EXE/rpclocal.dll index 001d0efe..e4ba157f 100644 Binary files a/EXE/rpclocal.dll and b/EXE/rpclocal.dll differ diff --git a/EXE/server.dll b/EXE/server.dll index 2042ddcc..6cb47665 100644 Binary files a/EXE/server.dll and b/EXE/server.dll differ diff --git a/EXE/shading.dll b/EXE/shading.dll index 6661f24f..345fb492 100644 Binary files a/EXE/shading.dll and b/EXE/shading.dll differ