From 0a3b5253d1afbeaf795243573e6247c0a98f0cbb Mon Sep 17 00:00:00 2001 From: extrawurst Date: Mon, 8 Dec 2025 21:31:30 -0500 Subject: [PATCH 01/28] fix rotation --- assets/models/medic_particle.glb | Bin 7192 -> 7172 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/assets/models/medic_particle.glb b/assets/models/medic_particle.glb index af42eda6ea31b884d46a2fbb4a868a3d152ed179..318fbca3a1b4dd8c2e7c7f148013c9245dcea9d2 100644 GIT binary patch delta 84 zcmbPX(PF`yo)hB6#K6G7BE!J2Vj`~vo2j0Go{`~1?;=fI13gnq0|Qe73qvzgV^d2L kOLH9q5Y)3UFgG?cGc+~=Qbq=58-HJAVN}?Bfz?9{02)0L`2YX_ delta 103 zcmZp%m|?-2o)hB6#K6EHA;ZA1XCki!n~9#Oo{9NH?;<+`9bE%G3j=dwGc!YDBOqmD zU Date: Tue, 9 Dec 2025 06:44:04 -0500 Subject: [PATCH 02/28] replicate Npc marker component this fixes the broken target_ui --- crates/shared/src/protocol/mod.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/crates/shared/src/protocol/mod.rs b/crates/shared/src/protocol/mod.rs index 754f691..e181077 100644 --- a/crates/shared/src/protocol/mod.rs +++ b/crates/shared/src/protocol/mod.rs @@ -15,6 +15,7 @@ use crate::{ head::ActiveHead, heads::{ActiveHeads, heads_ui::UiActiveHeads}, hitpoints::Hitpoints, + npc::Npc, platforms::ActivePlatform, player::{Player, PlayerBodyMesh}, tick::GameTick, @@ -92,6 +93,7 @@ pub fn plugin(app: &mut App) { .replicate::() .replicate_once::() .replicate_once::() + .replicate_once::() .replicate::() .replicate_once::() .replicate::() From 5c0e78cb8a4ec4add4594964e6cead694513d492 Mon Sep 17 00:00:00 2001 From: extrawurst Date: Tue, 9 Dec 2025 08:23:59 -0500 Subject: [PATCH 03/28] fix impulse of head/key drops --- crates/server/src/head_drop.rs | 17 ++++------------- crates/shared/src/head_drop.rs | 4 ++++ crates/shared/src/keys.rs | 9 ++++----- crates/shared/src/utils/one_shot_force.rs | 8 ++++---- 4 files changed, 16 insertions(+), 22 deletions(-) diff --git a/crates/server/src/head_drop.rs b/crates/server/src/head_drop.rs index 7473228..f85c1b2 100644 --- a/crates/server/src/head_drop.rs +++ b/crates/server/src/head_drop.rs @@ -12,7 +12,7 @@ use shared::{ player::Player, protocol::{GltfSceneRoot, PlaySound}, utils::{ - billboards::Billboard, one_shot_force::OneShotForce, squish_animation::SquishAnimation, + billboards::Billboard, one_shot_force::OneShotImpulse, squish_animation::SquishAnimation, }, }; use std::f32::consts::PI; @@ -28,15 +28,9 @@ fn on_head_drop( time: Res