From 79711ad3f0020481926d6b77a0b1af5589d5656b Mon Sep 17 00:00:00 2001 From: Sofia Date: Mon, 3 Aug 2026 23:23:02 +0300 Subject: [PATCH] Update theme for labels --- godot/scenes/player/local_player.tscn | 2 ++ godot/scenes/player/remote_player.tscn | 2 ++ godot/scenes/player/replay_player.tscn | 2 ++ rust/src/player/remote_player.rs | 1 - rust/src/ui/lobby.rs | 1 - 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/godot/scenes/player/local_player.tscn b/godot/scenes/player/local_player.tscn index aa5185b..15fb442 100644 --- a/godot/scenes/player/local_player.tscn +++ b/godot/scenes/player/local_player.tscn @@ -12,6 +12,7 @@ [ext_resource type="AudioStream" uid="uid://cl416orgv11vj" path="res://raw_assets/sfx/ball/little_robot_sound_factory_fantasy_Inventory_Open_00.mp3" id="8_cmcit"] [ext_resource type="AudioStream" uid="uid://uq0o8gkpqhfa" path="res://raw_assets/sfx/ball/zapsplat_foley_stick_swing_air_whoosh_very_fast_hard_003_110413.mp3" id="9_qpw6d"] [ext_resource type="PackedScene" uid="uid://uvwg721hwp71" path="res://scenes/ui/cooldown_icon.tscn" id="10_h6dt6"] +[ext_resource type="Theme" uid="uid://drydbnrcdv4pk" path="res://default_theme.tres" id="11_0yoer"] [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_oh8vq"] @@ -105,6 +106,7 @@ offset_right = 20.0 offset_bottom = 11.5 grow_horizontal = 2 grow_vertical = 2 +theme = ExtResource("11_0yoer") horizontal_alignment = 1 [node name="hit_sound" type="AudioStreamPlayer" parent="." unique_id=1224745673] diff --git a/godot/scenes/player/remote_player.tscn b/godot/scenes/player/remote_player.tscn index bc29815..d9e090f 100644 --- a/godot/scenes/player/remote_player.tscn +++ b/godot/scenes/player/remote_player.tscn @@ -4,6 +4,7 @@ [ext_resource type="PackedScene" uid="uid://bod6b3befmyt5" path="res://scenes/player/soldier_m.tscn" id="1_e2ekk"] [ext_resource type="PackedScene" uid="uid://cl66unms2gim0" path="res://scenes/player/effects.tscn" id="2_orxjf"] [ext_resource type="AudioStream" uid="uid://cl416orgv11vj" path="res://raw_assets/sfx/ball/little_robot_sound_factory_fantasy_Inventory_Open_00.mp3" id="3_840kl"] +[ext_resource type="FontFile" uid="uid://hptdnjg4ec58" path="res://font/static/SpaceGrotesk-Medium.ttf" id="4_7rax4"] [ext_resource type="AudioStream" uid="uid://uq0o8gkpqhfa" path="res://raw_assets/sfx/ball/zapsplat_foley_stick_swing_air_whoosh_very_fast_hard_003_110413.mp3" id="4_qn18y"] [ext_resource type="PackedScene" uid="uid://bnha3gon4700q" path="res://scenes/misc/arrow.tscn" id="5_qn18y"] @@ -87,6 +88,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.3304863, 0) pixel_size = 0.002 billboard = 1 text = "asd" +font = ExtResource("4_7rax4") font_size = 64 [node name="health_bar_sprite" type="Sprite3D" parent="." unique_id=1478315510] diff --git a/godot/scenes/player/replay_player.tscn b/godot/scenes/player/replay_player.tscn index 17e24ff..28d0945 100644 --- a/godot/scenes/player/replay_player.tscn +++ b/godot/scenes/player/replay_player.tscn @@ -2,6 +2,7 @@ [ext_resource type="PackedScene" uid="uid://bod6b3befmyt5" path="res://scenes/player/soldier_m.tscn" id="1_bfcd3"] [ext_resource type="PackedScene" uid="uid://cl66unms2gim0" path="res://scenes/player/effects.tscn" id="2_rejks"] +[ext_resource type="FontFile" uid="uid://hptdnjg4ec58" path="res://font/static/SpaceGrotesk-Medium.ttf" id="3_0brji"] [ext_resource type="AudioStream" uid="uid://cl416orgv11vj" path="res://raw_assets/sfx/ball/little_robot_sound_factory_fantasy_Inventory_Open_00.mp3" id="3_o85ek"] [ext_resource type="AudioStream" uid="uid://uq0o8gkpqhfa" path="res://raw_assets/sfx/ball/zapsplat_foley_stick_swing_air_whoosh_very_fast_hard_003_110413.mp3" id="4_fwayu"] [ext_resource type="PackedScene" uid="uid://bnha3gon4700q" path="res://scenes/misc/arrow.tscn" id="5_fwayu"] @@ -82,6 +83,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.3304863, 0) pixel_size = 0.002 billboard = 1 text = "asd" +font = ExtResource("3_0brji") font_size = 64 [node name="health_bar_sprite" type="Sprite3D" parent="." unique_id=1478315510] diff --git a/rust/src/player/remote_player.rs b/rust/src/player/remote_player.rs index f32d015..b57db9f 100644 --- a/rust/src/player/remote_player.rs +++ b/rust/src/player/remote_player.rs @@ -10,7 +10,6 @@ use godot::{ use crate::{ game::{Game, opts::GameOption}, killbox::KillboxKind, - net::network_manager::NetworkManager, pickup::PickupKind, player::{ DamageSource, DamageSourceSignal, IPlayer, NetTransform, PlayerCommon, diff --git a/rust/src/ui/lobby.rs b/rust/src/ui/lobby.rs index 6b0f481..9859b1c 100644 --- a/rust/src/ui/lobby.rs +++ b/rust/src/ui/lobby.rs @@ -14,7 +14,6 @@ use crate::{ Game, GameManager, opts::{GameOption, GameOptionValue, GameOptions, TeamOptions}, }, - lobby_world::LobbyWorld, net::network_manager::{NetworkManager, Package, PeerKind}, ui::lobby_player_listing::LobbyPlayerListing, };