Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 13 additions & 13 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -240,20 +240,20 @@ ghost = { path = "game/ghost" }
legacy-proxy = { path = "game/legacy-proxy" }
prediction-timer = { path = "game/prediction-timer" }

anyhow = { version = "1.0.99", features = ["backtrace"] }
anyhow = { version = "1.0.100", features = ["backtrace"] }
arrayvec = "0.7.6"
bincode = { version = "2.0.1", features = ["serde"] }
bytes = "1.10.1"
chrono = { version = "0.4.41", features = ["serde"] }
chrono = { version = "0.4.42", features = ["serde"] }
crossbeam = "0.8.4"
egui = { version = "0.32.2", default-features = false, features = ["serde"] }
egui-winit = { version = "0.32.2", default-features = false, features = [
egui = { version = "0.32.3", default-features = false, features = ["serde"] }
egui-winit = { version = "0.32.3", default-features = false, features = [
"x11",
"arboard",
"links",
] }
egui_extras = { version = "0.32.2" }
emath = "0.32.2"
egui_extras = { version = "0.32.3" }
emath = "0.32.3"
env_logger = "0.11.8"
fixed = "1.29.0"
hashlink = { git = "https://github.com/Jupeyy/hashlink/", branch = "ddnet", features = [
Expand All @@ -263,21 +263,21 @@ hashlink = { git = "https://github.com/Jupeyy/hashlink/", branch = "ddnet", feat
hiarc = { path = "lib/hiarc", features = ["derive"] }
log = "0.4.28"
num = "0.4.3"
parking_lot = "0.12.4"
parking_lot = "0.12.5"
rand = { version = "0.9.2", features = ["std_rng"], default-features = false }
rayon = "1.11.0"
serde = "1.0.219"
serde = "1.0.228"
serde-value = "0.7.0"
serde_json = "1.0.143"
serde_json = "1.0.145"
thread-priority = "3.0.0"
tokio = { version = "1.47.1", features = [
tokio = { version = "1.48.0", features = [
"rt-multi-thread",
"sync",
"fs",
"time",
"macros",
] }
tracing = { version = "0.1.40", default-features = false, features = [
tracing = { version = "0.1.41", default-features = false, features = [
"attributes",
] }
trybuild = "1.0"
Expand All @@ -292,14 +292,14 @@ alloc-track = { version = "0.3.1", optional = true }
stats_alloc = { version = "0.1.10", optional = true }

[target.'cfg(not(target_os = "android"))'.dependencies]
native-dialog = "0.9.0"
native-dialog = "0.9.2"

[target.'cfg(target_os = "android")'.dependencies]
android_logger = "0.15.1"
ndk = { version = "0.9.0", default-features = false }

[target.'cfg(target_arch = "wasm32")'.dependencies]
tracing = { version = "0.1.40", default-features = false, features = [
tracing = { version = "0.1.41", default-features = false, features = [
"max_level_off",
"release_max_level_off",
] }
Expand Down
2 changes: 1 addition & 1 deletion data
Submodule data updated 76 files
+ hooks/default/hit_unhookable_003.ogg
+ ninjas/default/audio/attack_004.ogg
+ ninjas/default/skin/eyes_left/blink.png
+ ninjas/default/skin/eyes_right/blink.png
+ skins/default/eyes_left/blink.png
+ skins/default/eyes_right/blink.png
+ weapons/default/grenade/audio/collect_001.ogg
+ weapons/default/grenade/audio/explosion_001.ogg
+ weapons/default/grenade/audio/explosion_002.ogg
+ weapons/default/grenade/audio/explosion_003.ogg
+ weapons/default/grenade/audio/fire_001.ogg
+ weapons/default/grenade/audio/fire_002.ogg
+ weapons/default/grenade/audio/fire_003.ogg
+ weapons/default/grenade/audio/noammo_001.ogg
+ weapons/default/grenade/audio/noammo_002.ogg
+ weapons/default/grenade/audio/noammo_003.ogg
+ weapons/default/grenade/audio/noammo_004.ogg
+ weapons/default/grenade/audio/noammo_005.ogg
+ weapons/default/grenade/audio/spawn_001.ogg
+ weapons/default/grenade/audio/switch_001.ogg
+ weapons/default/grenade/audio/switch_002.ogg
+ weapons/default/grenade/audio/switch_003.ogg
+ weapons/default/gun/audio/fire_001.ogg
+ weapons/default/gun/audio/fire_002.ogg
+ weapons/default/gun/audio/fire_003.ogg
+ weapons/default/gun/audio/noammo_001.ogg
+ weapons/default/gun/audio/noammo_002.ogg
+ weapons/default/gun/audio/noammo_003.ogg
+ weapons/default/gun/audio/noammo_004.ogg
+ weapons/default/gun/audio/noammo_005.ogg
+ weapons/default/gun/audio/switch_001.ogg
+ weapons/default/gun/audio/switch_002.ogg
+ weapons/default/gun/audio/switch_003.ogg
+ weapons/default/hammer/audio/fire_001.ogg
+ weapons/default/hammer/audio/fire_002.ogg
+ weapons/default/hammer/audio/fire_003.ogg
+ weapons/default/hammer/audio/hit_001.ogg
+ weapons/default/hammer/audio/hit_002.ogg
+ weapons/default/hammer/audio/hit_003.ogg
+ weapons/default/hammer/audio/noammo_001.ogg
+ weapons/default/hammer/audio/noammo_002.ogg
+ weapons/default/hammer/audio/noammo_003.ogg
+ weapons/default/hammer/audio/noammo_004.ogg
+ weapons/default/hammer/audio/noammo_005.ogg
+ weapons/default/hammer/audio/switch_001.ogg
+ weapons/default/hammer/audio/switch_002.ogg
+ weapons/default/hammer/audio/switch_003.ogg
+ weapons/default/laser/audio/bounce_001.ogg
+ weapons/default/laser/audio/bounce_002.ogg
+ weapons/default/laser/audio/bounce_003.ogg
+ weapons/default/laser/audio/collect_001.ogg
+ weapons/default/laser/audio/fire_001.ogg
+ weapons/default/laser/audio/fire_002.ogg
+ weapons/default/laser/audio/fire_003.ogg
+ weapons/default/laser/audio/noammo_001.ogg
+ weapons/default/laser/audio/noammo_002.ogg
+ weapons/default/laser/audio/noammo_003.ogg
+ weapons/default/laser/audio/noammo_004.ogg
+ weapons/default/laser/audio/noammo_005.ogg
+ weapons/default/laser/audio/spawn_001.ogg
+ weapons/default/laser/audio/switch_001.ogg
+ weapons/default/laser/audio/switch_002.ogg
+ weapons/default/laser/audio/switch_003.ogg
+ weapons/default/shotgun/audio/collect_001.ogg
+ weapons/default/shotgun/audio/fire_001.ogg
+ weapons/default/shotgun/audio/fire_002.ogg
+ weapons/default/shotgun/audio/fire_003.ogg
+ weapons/default/shotgun/audio/noammo_001.ogg
+ weapons/default/shotgun/audio/noammo_002.ogg
+ weapons/default/shotgun/audio/noammo_003.ogg
+ weapons/default/shotgun/audio/noammo_004.ogg
+ weapons/default/shotgun/audio/noammo_005.ogg
+ weapons/default/shotgun/audio/spawn_001.ogg
+ weapons/default/shotgun/audio/switch_001.ogg
+ weapons/default/shotgun/audio/switch_002.ogg
+ weapons/default/shotgun/audio/switch_003.ogg
2 changes: 1 addition & 1 deletion examples/lib-modules/editor-lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ config = { path = "../../../lib/config" }
graphics = { path = "../../../lib/graphics" }
sound = { path = "../../../lib/sound" }

egui = { version = "0.32.2", default-features = false, features = ["serde"] }
egui = { version = "0.32.3", default-features = false, features = ["serde"] }
once_cell = "1.21.3"
rayon = "1.11.0"
2 changes: 1 addition & 1 deletion examples/wasm-modules/actionfeed/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ client-types = { path = "../../../game/client-types" }
client-ui = { path = "../../../game/client-ui" }
game-interface = { path = "../../../game/game-interface" }

egui = { version = "0.32.2", default-features = false, features = ["serde"] }
egui = { version = "0.32.3", default-features = false, features = ["serde"] }
num-traits = "0.2.19"
2 changes: 1 addition & 1 deletion examples/wasm-modules/chat/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ client-ui = { path = "../../../game/client-ui" }
game-base = { path = "../../../game/game-base" }
game-interface = { path = "../../../game/game-interface" }

egui = { version = "0.32.2", default-features = false, features = ["serde"] }
egui = { version = "0.32.3", default-features = false, features = ["serde"] }
2 changes: 1 addition & 1 deletion examples/wasm-modules/connecting/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ ui-generic = { path = "../../../lib/ui-generic" }
api-ui-game = { path = "../../../game/api-ui-game" }
client-ui = { path = "../../../game/client-ui" }

egui = { version = "0.32.2", default-features = false, features = ["serde"] }
egui = { version = "0.32.3", default-features = false, features = ["serde"] }
2 changes: 1 addition & 1 deletion examples/wasm-modules/console/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ client-render-base = { path = "../../../game/client-render-base" }
client-types = { path = "../../../game/client-types" }
client-ui = { path = "../../../game/client-ui" }

egui = { version = "0.32.2", default-features = false, features = ["serde"] }
egui = { version = "0.32.3", default-features = false, features = ["serde"] }
2 changes: 1 addition & 1 deletion examples/wasm-modules/demo_player/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ ui-generic = { path = "../../../lib/ui-generic" }
api-ui-game = { path = "../../../game/api-ui-game" }
client-ui = { path = "../../../game/client-ui" }

egui = { version = "0.32.2", default-features = false, features = ["serde"] }
egui = { version = "0.32.3", default-features = false, features = ["serde"] }
2 changes: 1 addition & 1 deletion examples/wasm-modules/emote_wheel/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ client-containers = { path = "../../../game/client-containers" }
client-render-base = { path = "../../../game/client-render-base" }
client-ui = { path = "../../../game/client-ui" }

egui = { version = "0.32.2", default-features = false, features = ["serde"] }
egui = { version = "0.32.3", default-features = false, features = ["serde"] }
6 changes: 3 additions & 3 deletions examples/wasm-modules/graphics-mod/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ pool = { path = "../../../lib/pool", features = ["enable_hiarc"] }

api-state = { path = "../../../game/api-state" }

anyhow = { version = "1.0.99", features = ["backtrace"] }
anyhow = { version = "1.0.100", features = ["backtrace"] }
arrayvec = "0.7.6"
bitflags = { version = "2.9.4", features = ["serde"] }
bitflags = { version = "2.10.0", features = ["serde"] }
num-derive = "0.4.2"
num-traits = "0.2.19"
rayon = "1.11.0"
tracing = { version = "0.1.40", default-features = false, features = [
tracing = { version = "0.1.41", default-features = false, features = [
"attributes",
] }
2 changes: 1 addition & 1 deletion examples/wasm-modules/hud/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ client-render-base = { path = "../../../game/client-render-base" }
client-ui = { path = "../../../game/client-ui" }
game-interface = { path = "../../../game/game-interface" }

egui = { version = "0.32.2", default-features = false, features = ["serde"] }
egui = { version = "0.32.3", default-features = false, features = ["serde"] }
6 changes: 3 additions & 3 deletions examples/wasm-modules/ingame_menu/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ game-base = { path = "../../../game/game-base" }
game-config = { path = "../../../game/game-config" }
game-interface = { path = "../../../game/game-interface" }

anyhow = { version = "1.0.99", features = ["backtrace"] }
anyhow = { version = "1.0.100", features = ["backtrace"] }
async-trait = "0.1.89"
egui = { version = "0.32.2", default-features = false, features = ["serde"] }
egui = { version = "0.32.3", default-features = false, features = ["serde"] }
email_address = { version = "0.2.9", features = ["serde"] }
serde_json = "1.0.143"
serde_json = "1.0.145"
6 changes: 3 additions & 3 deletions examples/wasm-modules/mainmenu/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ client-ui = { path = "../../../game/client-ui" }
game-base = { path = "../../../game/game-base" }
game-config = { path = "../../../game/game-config" }

anyhow = { version = "1.0.99", features = ["backtrace"] }
anyhow = { version = "1.0.100", features = ["backtrace"] }
async-trait = "0.1.89"
egui = { version = "0.32.2", default-features = false, features = ["serde"] }
egui = { version = "0.32.3", default-features = false, features = ["serde"] }
email_address = { version = "0.2.9", features = ["serde"] }
serde_json = "1.0.143"
serde_json = "1.0.145"
2 changes: 1 addition & 1 deletion examples/wasm-modules/motd/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ ui-generic = { path = "../../../lib/ui-generic" }
api-ui-game = { path = "../../../game/api-ui-game" }
client-ui = { path = "../../../game/client-ui" }

egui = { version = "0.32.2", default-features = false, features = ["serde"] }
egui = { version = "0.32.3", default-features = false, features = ["serde"] }
2 changes: 1 addition & 1 deletion examples/wasm-modules/prediction_timer_ui/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ ui-generic = { path = "../../../lib/ui-generic" }
api-ui-game = { path = "../../../game/api-ui-game" }
prediction-timer = { path = "../../../game/prediction-timer" }

egui = { version = "0.32.2", default-features = false, features = ["serde"] }
egui = { version = "0.32.3", default-features = false, features = ["serde"] }
egui_plot = { version = "0.33.0" }
2 changes: 1 addition & 1 deletion examples/wasm-modules/scoreboard/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ client-render-base = { path = "../../../game/client-render-base" }
client-ui = { path = "../../../game/client-ui" }
game-interface = { path = "../../../game/game-interface" }

egui = { version = "0.32.2", default-features = false, features = ["serde"] }
egui = { version = "0.32.3", default-features = false, features = ["serde"] }
14 changes: 7 additions & 7 deletions examples/wasm-modules/state/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,13 @@ vanilla = { path = "../../../game/vanilla" }

ddnet-accounts-types = { version = "0.1.0" }

anyhow = { version = "1.0.99", features = ["backtrace"] }
anyhow = { version = "1.0.100", features = ["backtrace"] }
arrayvec = { version = "0.7.6", features = ["serde"] }
async-trait = "0.1.89"
bincode = { features = ["serde"], version = "2.0.1" }
bitflags = { version = "2.9.4", features = ["serde"] }
chrono = { version = "0.4.41", default-features = false, features = ["serde"] }
flate2 = "1.1.2"
bitflags = { version = "2.10.0", features = ["serde"] }
chrono = { version = "0.4.42", default-features = false, features = ["serde"] }
flate2 = "1.1.5"
hashlink = { git = "https://github.com/Jupeyy/hashlink/", branch = "ddnet", features = [
"serde",
"serde_impl",
Expand All @@ -90,6 +90,6 @@ num-derive = "0.4.2"
num-traits = "0.2.19"
rayon = "1.11.0"
rustc-hash = "2.1.1"
serde = "1.0.219"
serde_json = "1.0.143"
thiserror = "2.0.16"
serde = "1.0.228"
serde_json = "1.0.145"
thiserror = "2.0.17"
2 changes: 1 addition & 1 deletion examples/wasm-modules/ui/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ ui-generic = { path = "../../../lib/ui-generic" }

api-ui-game = { path = "../../../game/api-ui-game" }

egui = { version = "0.32.2", default-features = false, features = ["serde"] }
egui = { version = "0.32.3", default-features = false, features = ["serde"] }
2 changes: 1 addition & 1 deletion examples/wasm-modules/vote/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ client-render-base = { path = "../../../game/client-render-base" }
client-ui = { path = "../../../game/client-ui" }
game-interface = { path = "../../../game/game-interface" }

egui = { version = "0.32.2", default-features = false, features = ["serde"] }
egui = { version = "0.32.3", default-features = false, features = ["serde"] }
2 changes: 1 addition & 1 deletion game/api-editor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ api-wasm-macros = { path = "../../lib/api-wasm-macros" }
config = { path = "../../lib/config" }
graphics-types = { path = "../../lib/graphics-types" }

egui = { version = "0.32.2", default-features = false, features = ["serde"] }
egui = { version = "0.32.3", default-features = false, features = ["serde"] }
once_cell = "1.21.3"
10 changes: 5 additions & 5 deletions game/assets-base/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ hiarc = { path = "../../lib/hiarc", features = [
"enable_serde_json",
] }

anyhow = { version = "1.0.99", features = ["backtrace"] }
chrono = { version = "0.4.41", default-features = false, features = ["serde"] }
anyhow = { version = "1.0.100", features = ["backtrace"] }
chrono = { version = "0.4.42", default-features = false, features = ["serde"] }
rustc-hash = "2.1.1"
serde = { version = "1.0.219", features = ["derive"] }
serde_json = "1.0.143"
symphonia = { version = "0.5.4", default-features = false, features = [
serde = { version = "1.0.228", features = ["derive"] }
serde_json = "1.0.145"
symphonia = { version = "0.5.5", default-features = false, features = [
"ogg",
"vorbis",
] }
Expand Down
5 changes: 4 additions & 1 deletion game/assets-splitting/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,7 @@ edition = "2024"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
anyhow = { version = "1.0.99", features = ["backtrace"] }
image-utils = { path = "../../lib/image-utils" }

anyhow = { version = "1.0.100", features = ["backtrace"] }
rayon = "1.11.0"
45 changes: 44 additions & 1 deletion game/assets-splitting/src/skin_split.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
use std::borrow::Cow;

use anyhow::anyhow;
use image_utils::{png::resize_rgba, utils::dilate_image};

#[derive(Debug, Clone)]
pub struct Skin06Part {
Expand Down Expand Up @@ -29,6 +32,7 @@ pub struct Skin06ConvertResult {
pub foot_outline: Skin06Part,

pub eye_normal: Skin06Part,
pub eye_blink: Skin06Part,
pub eye_angry: Skin06Part,
pub eye_pain: Skin06Part,
pub eye_happy: Skin06Part,
Expand All @@ -38,7 +42,7 @@ pub struct Skin06ConvertResult {
pub watermark: Skin06Part,
}

/// skin texture is like this (assuming 256x128)
/// Skin texture is like this (assuming 256x128)
///
/// |-------------------------------------------------------------------------------------|
/// | | | 32x32 | 32x32 |
Expand All @@ -54,6 +58,7 @@ pub struct Skin06ConvertResult {
///
/// Additionally the width has to be divisible by 8 and the height by 4
pub fn split_06_skin(
tp: &rayon::ThreadPool,
skin_file: &[u8],
width: u32,
height: u32,
Expand Down Expand Up @@ -120,6 +125,8 @@ pub fn split_06_skin(
eye_surprise.extend(eye_surprise_seg);
}
});
let eye_blink = generate_eye_blink_texture(tp, &eye_normal, segment_width, segment_height);

Ok(Skin06ConvertResult {
body: Skin06Part::new(body, segment_width * 3, segment_height * 3),
body_outline: Skin06Part::new(body_outline, segment_width * 3, segment_height * 3),
Expand All @@ -131,6 +138,7 @@ pub fn split_06_skin(
foot_outline: Skin06Part::new(foot_outline, segment_width * 2, segment_height),

eye_normal: Skin06Part::new(eye_normal, segment_width, segment_height),
eye_blink: Skin06Part::new(eye_blink, segment_width, segment_height),
eye_angry: Skin06Part::new(eye_angry, segment_width, segment_height),
eye_pain: Skin06Part::new(eye_pain, segment_width, segment_height),
eye_happy: Skin06Part::new(eye_happy, segment_width, segment_height),
Expand All @@ -141,3 +149,38 @@ pub fn split_06_skin(
})
}
}

fn generate_eye_blink_texture(
tp: &rayon::ThreadPool,
eye_normal: &[u8],
width: usize,
height: usize,
) -> Vec<u8> {
const BLINK_HEIGHT_RATIO: f32 = 0.15 / 0.40;
let target_height = ((height as f32) * BLINK_HEIGHT_RATIO)
.round()
.clamp(1.0, height as f32) as u32;

let resized = resize_rgba(
Cow::Borrowed(eye_normal),
width as u32,
height as u32,
width as u32,
target_height,
);

let mut blink = vec![0u8; width * height * 4];
let stride = width * 4;
let offset_y = ((height as u32).saturating_sub(target_height) / 2) as usize;

for row in 0..target_height as usize {
let src_start = row * stride;
let dst_start = (offset_y + row) * stride;
blink[dst_start..dst_start + stride]
.copy_from_slice(&resized[src_start..src_start + stride]);
}

dilate_image(tp, &mut blink, width, height, 4);

blink
}
4 changes: 2 additions & 2 deletions game/binds/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ command-parser = { path = "../../lib/command-parser" }
hiarc = { path = "../../lib/hiarc" }
input-binds = { path = "../../lib/input-binds" }

anyhow = { version = "1.0.99", features = ["backtrace"] }
anyhow = { version = "1.0.100", features = ["backtrace"] }
log = "0.4.28"
serde_json = "1.0.143"
serde_json = "1.0.145"
6 changes: 3 additions & 3 deletions game/client-accounts/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ steam = { path = "../../lib/steam" }
client-ui = { path = "../client-ui" }
http-accounts = { path = "../http-accounts" }

anyhow = { version = "1.0.99", features = ["backtrace"] }
anyhow = { version = "1.0.100", features = ["backtrace"] }
async-trait = "0.1.89"
chrono = { version = "0.4.41" }
chrono = { version = "0.4.42" }
ddnet-account-client-http-fs = { version = "0.3.0" }
ddnet-accounts-shared = { version = "0.2.0" }
email_address = { version = "0.2.9", features = ["serde"] }
serde_json = "1.0.143"
serde_json = "1.0.145"
url = { version = "2.5.7", features = ["serde"] }
Loading
Loading