diff --git a/BUILD_INFO.txt b/BUILD_INFO.txt index a6e38535..c24c3b88 100644 --- a/BUILD_INFO.txt +++ b/BUILD_INFO.txt @@ -1,6 +1,6 @@ REM-Client test build (64-bit) -date: 2026-11-09 11:03 -commit: d89ae954 (main) -subject: Skybox: a cube map in place of the star sphere when the material data has one +date: 2026-11-09 11:23 +commit: d03c3b18 (main) +subject: Jump tunnels: a warp in place of the tube tree: clean build: OK diff --git a/DATA/FX/gate_tunnel.ini b/DATA/FX/gate_tunnel.ini index 8e2a3a99..aebc983c 100644 --- a/DATA/FX/gate_tunnel.ini +++ b/DATA/FX/gate_tunnel.ini @@ -190,6 +190,7 @@ v_scale = 10 ; REM: irregular jump-hole presentation; no route/protocol changes. [gate_tunnel] nickname = rem_tunnel_hole +warp_chaos = 1 ; REM warp: 0 calm (gates), 1 chaotic (swirl, jolts, suns) write_depth_buffer = 0 num_spline_control_points = 9 x_range = 850 diff --git a/DATA/FX/jumpeffect.ini b/DATA/FX/jumpeffect.ini index 02c3423a..2ed65c5a 100644 --- a/DATA/FX/jumpeffect.ini +++ b/DATA/FX/jumpeffect.ini @@ -53,8 +53,8 @@ glow_ring_effect = jumpgate_tunnel, jumpgate_rings, jumpgate_rings, jumpgate_end glow_ring_hp = HpFX2, HpFX3, HpFX4, HpFX5, HpFX5 glow_create_time = 1, 3, 5, 7, 9 jump_out_time = 1.5 -jump_out_tunnel_time = 3.5 -jump_in_tunnel_time = 1.5 +jump_out_tunnel_time = 6 +jump_in_tunnel_time = 2.5 jump_in_time = 1 kill_time_before_done = 0.6 jump_tunnel_effect = jump_tunnel_interior_player diff --git a/DATA/FX/rem_warp_regions.ini b/DATA/FX/rem_warp_regions.ini new file mode 100644 index 00000000..10b3694b --- /dev/null +++ b/DATA/FX/rem_warp_regions.ini @@ -0,0 +1,53 @@ +; REM: the colours of a jump gate's warp tunnel by the region of the system it leads to (jump holes keep +; their own look, see warp_chaos in gate_tunnel.ini). Read once by the client. +; cloud_color = the near and the far cloud layer, r, g, b each (0..255; brighter = more glow) +; dark = 0..1, how much the clouds hide the stars and darken the tunnel (black smoke) +; system = the systems of the region (several per line, as many lines as needed) +; A system in no list takes the section named "default". + +[WarpRegion] +nickname = default +cloud_color = 36, 71, 204, 26, 87, 180 +dark = 0 + +[WarpRegion] +nickname = blue ; Kusari +cloud_color = 36, 71, 204, 26, 87, 180 +dark = 0 +system = Ku01, Ku02, Ku03, Ku04, Ku05, Ku06, Ku07 +system = Iw05, Iw06, Hi01, Ew02 + +[WarpRegion] +nickname = green ; the Sigmas and Omicrons in the east +cloud_color = 26, 158, 77, 46, 178, 140 +dark = 0 +system = Bw05, Bw06, Bw07, Bw11 +system = St01, St02, St03, St03b, St02c, ST04, St05, FP7_system +system = Ew04, Ew05, Ew06, Hi02 + +[WarpRegion] +nickname = brown ; Rheinland and the Omegas south of it +cloud_color = 178, 97, 31, 140, 71, 26 +dark = 0 +system = Rh01, Rh02, Rh03, Rh04, Rh05 +system = Bw03, Bw04, Ew03, Iw02 + +[WarpRegion] +nickname = white ; the Tau band +cloud_color = 153, 153, 158, 191, 184, 173 +dark = 0 +system = Bw08, Bw09, Bw10, Ew01, LI07 + +[WarpRegion] +nickname = red ; Bretonia +cloud_color = 191, 38, 31, 140, 26, 46 +dark = 0 +system = Br01, Br02, Br03, Br04, Br05, Br06 +system = Bw01, Bw02 + +[WarpRegion] +nickname = black ; Liberty +cloud_color = 15, 18, 28, 25, 25, 35 +dark = 0.85 +system = Li01, Li02, Li03, Li04, Li05, LI06 +system = Iw01, Iw03, Iw04 diff --git a/DLLS/BIN/content.dll b/DLLS/BIN/content.dll index 9d0abd8e..4a7f98b1 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..5f08339f 100644 Binary files a/EXE/DALib.dll and b/EXE/DALib.dll differ diff --git a/EXE/Freelancer.exe b/EXE/Freelancer.exe index 15d6f605..07d82e56 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..5f983147 100644 Binary files a/EXE/alchemy.dll and b/EXE/alchemy.dll differ diff --git a/EXE/common.dll b/EXE/common.dll index 4713e3e1..f030e614 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..e49987de 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..49ce59ec 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..c49e9dbd 100644 Binary files a/EXE/engbase.dll and b/EXE/engbase.dll differ diff --git a/EXE/flmaterials.dll b/EXE/flmaterials.dll index 1798ddb4..cc9405e3 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..d31eb573 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..3b578457 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..38d44027 100644 Binary files a/EXE/readfile.dll and b/EXE/readfile.dll differ diff --git a/EXE/remoteclient.dll b/EXE/remoteclient.dll index c89b4ae4..9cc10710 100644 Binary files a/EXE/remoteclient.dll and b/EXE/remoteclient.dll differ diff --git a/EXE/remoteserver.dll b/EXE/remoteserver.dll index 1292ee70..83be9967 100644 Binary files a/EXE/remoteserver.dll and b/EXE/remoteserver.dll differ diff --git a/EXE/rendcomp.dll b/EXE/rendcomp.dll index 966316bf..d5f356b0 100644 Binary files a/EXE/rendcomp.dll and b/EXE/rendcomp.dll differ diff --git a/EXE/rp8.dll b/EXE/rp8.dll index 943a0da6..0fb86729 100644 Binary files a/EXE/rp8.dll and b/EXE/rp8.dll differ diff --git a/EXE/rpclocal.dll b/EXE/rpclocal.dll index a981c421..565ac323 100644 Binary files a/EXE/rpclocal.dll and b/EXE/rpclocal.dll differ diff --git a/EXE/server.dll b/EXE/server.dll index 0cf28f19..73bfc5c1 100644 Binary files a/EXE/server.dll and b/EXE/server.dll differ diff --git a/EXE/shading.dll b/EXE/shading.dll index 25e86ad3..b8adda45 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..0e2de78a 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..d5a3cd84 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..a4207849 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..e406ea21 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..5ae83342 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..37e34bdc 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..8972c1b2 100644 Binary files a/EXE/zlib.dll and b/EXE/zlib.dll differ