diff --git a/Cargo.lock b/Cargo.lock index 2194e011..9409e5da 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -20,9 +20,9 @@ checksum = "366ffbaa4442f4684d91e2cd7c5ea7c4ed8add41959a31447066e279e432b618" [[package]] name = "accesskit" -version = "0.19.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25ae84c0260bdf5df07796d7cc4882460de26a2b406ec0e6c42461a723b271b" +checksum = "cf203f9d3bd8f29f98833d1fbef628df18f759248a547e7e01cfbf63cda36a99" dependencies = [ "enumn", "serde", @@ -90,9 +90,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" dependencies = [ "memchr", ] @@ -342,7 +342,7 @@ version = "0.1.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -400,7 +400,7 @@ version = "0.1.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -504,7 +504,7 @@ version = "0.38.0+1.3.281" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" dependencies = [ - "libloading", + "libloading 0.8.9", ] [[package]] @@ -554,7 +554,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", "synstructure", ] @@ -566,7 +566,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -592,7 +592,7 @@ dependencies = [ "assets-base", "axum", "base", - "clap 4.5.50", + "clap 4.5.51", "dotenvy", "env_logger", "image-utils", @@ -642,7 +642,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -668,7 +668,7 @@ checksum = "99e1aca718ea7b89985790c94aad72d77533063fe00bc497bb79a7c2dae6a661" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -1012,7 +1012,7 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -1030,7 +1030,7 @@ dependencies = [ "regex", "rustc-hash 2.1.1", "shlex", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -1188,9 +1188,9 @@ checksum = "b6709158fe6ca66c1f32eb27b4ae5997c67b0df350ae185831233af3e7a91213" [[package]] name = "bstr" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4" +checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab" dependencies = [ "memchr", "serde", @@ -1260,7 +1260,7 @@ checksum = "89385e82b5d1821d2219e0b095efa2cc1f246cbf99080f3be46a1a85c0d392d9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -1280,7 +1280,7 @@ checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -1373,9 +1373,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.43" +version = "1.2.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "739eb0f94557554b3ca9a86d2d37bebd49c5e6d0c1d2bda35ba5bdac830befc2" +checksum = "37521ac7aabe3d13122dc382493e20c9416f299d2ccd5b3a5340a2570cdeb0f3" dependencies = [ "find-msvc-tools", "jobserver", @@ -1489,7 +1489,7 @@ checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", - "libloading", + "libloading 0.8.9", ] [[package]] @@ -1507,9 +1507,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.50" +version = "4.5.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2cfd7bf8a6017ddaa4e32ffe7403d547790db06bd171c1c53926faab501623" +checksum = "4c26d721170e0295f191a69bd9a1f93efcdb0aff38684b61ab5750468972e5f5" dependencies = [ "clap_builder", "clap_derive", @@ -1517,9 +1517,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.50" +version = "4.5.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4c05b9e80c5ccd3a7ef080ad7b6ba7d6fc00a985b8b157197075677c82c7a0" +checksum = "75835f0c7bf681bfd05abe44e965760fea999a5286c6eb2d59883634fd02011a" dependencies = [ "anstream", "anstyle", @@ -1536,7 +1536,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -1697,7 +1697,7 @@ dependencies = [ "render-game-wasm", "sound", "tracing", - "wasmparser 0.238.1", + "wasmparser 0.240.0", ] [[package]] @@ -1995,7 +1995,7 @@ version = "0.1.0" dependencies = [ "anyhow", "axum", - "clap 4.5.50", + "clap 4.5.51", "community", "tokio", "tower-http", @@ -2008,7 +2008,7 @@ dependencies = [ "anyhow", "async-trait", "base", - "clap 4.5.50", + "clap 4.5.51", "community", "ddnet-account-client-http-fs", "ddnet-account-client-reqwest", @@ -2068,7 +2068,7 @@ version = "0.1.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -2550,7 +2550,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -2598,7 +2598,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -2620,7 +2620,7 @@ checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" dependencies = [ "darling_core 0.21.3", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -2989,7 +2989,7 @@ checksum = "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -3021,7 +3021,7 @@ checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -3063,7 +3063,7 @@ checksum = "6edb4b64a43d977b8e99788fe3a04d483834fba1215a7e02caa415b626497f7f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -3083,7 +3083,7 @@ checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", "unicode-xid", ] @@ -3109,7 +3109,7 @@ dependencies = [ name = "dilate" version = "0.1.0" dependencies = [ - "clap 4.5.50", + "clap 4.5.51", "image-utils", "oxipng", "rayon", @@ -3193,7 +3193,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -3211,7 +3211,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading", + "libloading 0.8.9", ] [[package]] @@ -3301,9 +3301,9 @@ dependencies = [ [[package]] name = "ecolor" -version = "0.32.3" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94bdf37f8d5bd9aa7f753573fdda9cf7343afa73dd28d7bfe9593bd9798fc07e" +checksum = "adf31f99fad93fe83c1055b92b5c1b135f1ecfa464789817c372000e768d4bd1" dependencies = [ "bytemuck", "emath", @@ -3441,7 +3441,7 @@ dependencies = [ "base-http", "base-io", "chrono", - "clap 4.5.50", + "clap 4.5.51", "config", "ed25519-dalek", "editor", @@ -3474,7 +3474,7 @@ dependencies = [ "egui", "graphics", "graphics-backend", - "libloading", + "libloading 0.9.0", "rayon", "sound", "tracing", @@ -3510,9 +3510,9 @@ dependencies = [ [[package]] name = "egui" -version = "0.32.3" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5d0306cd61ca75e29682926d71f2390160247f135965242e904a636f51c0dc" +checksum = "ab9b5d3376c79439f53a78bf7da1e3c0b862ffa3e29f46ab0f3e107430f2e576" dependencies = [ "accesskit", "ahash 0.8.12", @@ -3529,9 +3529,9 @@ dependencies = [ [[package]] name = "egui-file-dialog" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ae40a3a02bb2f617dd0f6b41d9fe64713667684f68d52694362cad22828e74" +checksum = "35f17e09f18a266f4ee9f1de0c22a6838d60b34d86a6c766f3d707accd483e50" dependencies = [ "directories 6.0.0", "dunce", @@ -3541,9 +3541,9 @@ dependencies = [ [[package]] name = "egui-notify" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd148c4c3fe05be0d9facf90add19a1531c1d7bfb9c7e4dbc179cfb31844d49" +checksum = "e8d811c81c13fbce131116eeb6b228086f2c7eb6e4105e03ceb3a358c53c1668" dependencies = [ "egui", ] @@ -3560,15 +3560,17 @@ dependencies = [ [[package]] name = "egui-winit" -version = "0.32.3" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f95d0a91f9cb0dc2e732d49c2d521ac8948e1f0b758f306fb7b14d6f5db3927f" +checksum = "bb4ea8cb063c00d8f23ce11279c01eb63a195a72be0e21d429148246dab7983e" dependencies = [ - "ahash 0.8.12", "arboard", "bytemuck", "egui", "log 0.4.28", + "objc2 0.5.2", + "objc2-foundation 0.2.2", + "objc2-ui-kit", "profiling", "raw-window-handle", "web-time", @@ -3578,9 +3580,9 @@ dependencies = [ [[package]] name = "egui_commonmark" -version = "0.21.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c9caff9c964af1e3d913acd85e86d2170e3169a43cf4ff84eea3106691c14d" +checksum = "d5246a4e9b83c345ec8230933bd0dca16d1c3c11db0edd4fd9c1a90683240b49" dependencies = [ "egui", "egui_commonmark_backend", @@ -3590,9 +3592,9 @@ dependencies = [ [[package]] name = "egui_commonmark_backend" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e317aa4031f27be77d4c1c33cb038cdf02d77790c28e5cf1283a66cceb88695" +checksum = "d3cff846279556f57af8ea606f2e4ceaf83e60b81db014c126dfb926fa06c75b" dependencies = [ "egui", "egui_extras", @@ -3601,9 +3603,9 @@ dependencies = [ [[package]] name = "egui_extras" -version = "0.32.3" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dddbceddf39805fc6c62b1f7f9c05e23590b40844dc9ed89c6dc6dbc886e3e3b" +checksum = "bdced1964ad8a02a116b1307f7b4f73dbe408c5f53dcdd488f527609f261da60" dependencies = [ "ahash 0.8.12", "egui", @@ -3616,9 +3618,9 @@ dependencies = [ [[package]] name = "egui_plot" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524318041a8ea90c81c738e8985f8ad9e3f9bed636b03c2ff37b218113ed5121" +checksum = "33233ffc010fd450381805bbbebecbbb82f077de7712ddc439f0b20effd42db7" dependencies = [ "ahash 0.8.12", "egui", @@ -3665,9 +3667,9 @@ dependencies = [ [[package]] name = "emath" -version = "0.32.3" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45fd7bc25f769a3c198fe1cf183124bf4de3bd62ef7b4f1eaf6b08711a3af8db" +checksum = "c615516cdceec867065f20d7db13d8eb8aedd65c9e32cc0c7c379380fa42e6e8" dependencies = [ "bytemuck", "serde", @@ -3695,7 +3697,7 @@ version = "0.1.0" dependencies = [ "assets-base", "assets-splitting", - "clap 4.5.50", + "clap 4.5.51", "image-utils", ] @@ -3751,7 +3753,7 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -3764,7 +3766,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -3776,7 +3778,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -3787,7 +3789,7 @@ checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -3808,7 +3810,7 @@ dependencies = [ "darling 0.21.3", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -3842,9 +3844,9 @@ dependencies = [ [[package]] name = "epaint" -version = "0.32.3" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63adcea970b7a13094fe97a36ab9307c35a750f9e24bf00bb7ef3de573e0fddb" +checksum = "9926b9500ccb917adb070207ec722dd8ea78b8321f94a85ebec776f501f2930c" dependencies = [ "ab_glyph", "ahash 0.8.12", @@ -3914,7 +3916,7 @@ version = "0.1.0" dependencies = [ "assets-base", "assets-splitting", - "clap 4.5.50", + "clap 4.5.51", "image-utils", ] @@ -3953,7 +3955,7 @@ checksum = "a0aca10fb742cb43f9e7bb8467c91aa9bcb8e3ffbc6a6f7389bb93ffc920577d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -4082,6 +4084,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" +[[package]] +name = "foldhash" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" + [[package]] name = "foreign-types" version = "0.3.2" @@ -4109,7 +4117,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -4231,7 +4239,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -4321,7 +4329,7 @@ version = "0.1.0" dependencies = [ "assets-base", "assets-splitting", - "clap 4.5.50", + "clap 4.5.51", "image-utils", ] @@ -4360,7 +4368,7 @@ version = "0.1.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -4625,7 +4633,7 @@ checksum = "53010ccb100b96a67bc32c0175f0ed1426b31b655d562898e57325f81c023ac0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -4891,7 +4899,7 @@ checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" dependencies = [ "allocator-api2", "equivalent", - "foldhash", + "foldhash 0.1.5", "serde", ] @@ -4900,6 +4908,9 @@ name = "hashbrown" version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" +dependencies = [ + "foldhash 0.2.0", +] [[package]] name = "hashlink" @@ -5029,7 +5040,7 @@ dependencies = [ "hiarc", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -5170,7 +5181,7 @@ version = "0.1.0" dependencies = [ "assets-base", "assets-splitting", - "clap 4.5.50", + "clap 4.5.51", "image-utils", ] @@ -5235,7 +5246,7 @@ dependencies = [ "tokio", "tokio-rustls", "tower-service", - "webpki-roots 1.0.3", + "webpki-roots 1.0.4", ] [[package]] @@ -5277,7 +5288,7 @@ dependencies = [ "tokio", "tower-service", "tracing", - "windows-registry", + "windows-registry 0.5.3", ] [[package]] @@ -5349,9 +5360,9 @@ dependencies = [ [[package]] name = "icu_collections" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47" +checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43" dependencies = [ "displaydoc", "potential_utf", @@ -5362,9 +5373,9 @@ dependencies = [ [[package]] name = "icu_locale_core" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a" +checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6" dependencies = [ "displaydoc", "litemap", @@ -5375,11 +5386,10 @@ dependencies = [ [[package]] name = "icu_normalizer" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979" +checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599" dependencies = [ - "displaydoc", "icu_collections", "icu_normalizer_data", "icu_properties", @@ -5390,42 +5400,38 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3" +checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" [[package]] name = "icu_properties" -version = "2.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b" +checksum = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99" dependencies = [ - "displaydoc", "icu_collections", "icu_locale_core", "icu_properties_data", "icu_provider", - "potential_utf", "zerotrie", "zerovec", ] [[package]] name = "icu_properties_data" -version = "2.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632" +checksum = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899" [[package]] name = "icu_provider" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af" +checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614" dependencies = [ "displaydoc", "icu_locale_core", - "stable_deref_trait", - "tinystr", "writeable", "yoke", "zerofrom", @@ -5462,9 +5468,9 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.24" +version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81776e6f9464432afcc28d03e52eb101c93b6f0566f52aef2427663e700f0403" +checksum = "d3d782a365a015e0f5c04902246139249abf769125006fbe7649e2ee88169b4a" dependencies = [ "crossbeam-deque", "globset", @@ -5640,9 +5646,9 @@ dependencies = [ [[package]] name = "iri-string" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2" +checksum = "4f867b9d1d896b67beb18518eda36fdb77a32ea590de864f1325b294a6d14397" dependencies = [ "memchr", "serde", @@ -5738,7 +5744,7 @@ checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -5775,9 +5781,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.81" +version = "0.3.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305" +checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65" dependencies = [ "once_cell", "wasm-bindgen", @@ -5925,18 +5931,18 @@ checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" [[package]] name = "libdeflate-sys" -version = "1.24.0" +version = "1.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "805824325366c44599dfeb62850fe3c7d7b3e3d75f9ab46785bc7dba3676815c" +checksum = "23bd6304ebf75390d8a99b88bdf2a266f62647838140cb64af8e6702f6e3fddc" dependencies = [ "cc", ] [[package]] name = "libdeflater" -version = "1.24.0" +version = "1.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b270bcc7e9d6dce967a504a55b1b0444f966aa9184e8605b531bc0492abb30bb" +checksum = "d5d4880e6d634d3d029d65fa016038e788cc728a17b782684726fb34ee140caf" dependencies = [ "libdeflate-sys", ] @@ -5951,6 +5957,16 @@ dependencies = [ "windows-link 0.2.1", ] +[[package]] +name = "libloading" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "754ca22de805bb5744484a5b151a9e1a8e837d5dc232c2d7d8c2e3492edc8b60" +dependencies = [ + "cfg-if", + "windows-link 0.2.1", +] + [[package]] name = "libm" version = "0.2.15" @@ -6162,7 +6178,7 @@ checksum = "de66c928222984aea59fcaed8ba627f388aaac3c1f57dcb05cc25495ef8faefe" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -6181,9 +6197,9 @@ dependencies = [ [[package]] name = "litemap" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" +checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" [[package]] name = "litrs" @@ -6237,7 +6253,7 @@ dependencies = [ "quote", "regex-syntax", "rustc_version", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -6281,12 +6297,13 @@ dependencies = [ [[package]] name = "machine-uid" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4506fa0abb0a2ea93f5862f55973da0a662d2ad0e98f337a1c5aac657f0892" +checksum = "7d7217d573cdb141d6da43113b098172e057d39915d79c4bdedbc3aacd46bd96" dependencies = [ "libc", - "winreg", + "windows-registry 0.6.1", + "windows-sys 0.61.2", ] [[package]] @@ -6354,7 +6371,7 @@ dependencies = [ "lz4_flex", "math", "rayon", - "ruzstd 0.8.1", + "ruzstd 0.8.2", "serde", "serde_json", "serde_with", @@ -6370,7 +6387,7 @@ dependencies = [ "base", "base-fs", "base-io", - "clap 4.5.50", + "clap 4.5.51", "env_logger", "log 0.4.28", "map", @@ -6632,9 +6649,9 @@ dependencies = [ [[package]] name = "moxcms" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692af879e4d9383c0fd9dec15524af6b6977c8bf1c6b278a4526d5341347c574" +checksum = "0fbdd3d7436f8b5e892b8b7ea114271ff0fa00bc5acae845d53b07d498616ef6" dependencies = [ "num-traits", "pxfm", @@ -6657,14 +6674,14 @@ checksum = "4568f25ccbd45ab5d5603dc34318c1ec56b117531781260002151b8530a9f931" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] name = "naga" -version = "26.0.0" +version = "27.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "916cbc7cb27db60be930a4e2da243cf4bc39569195f22fd8ee419cd31d5b662c" +checksum = "066cf25f0e8b11ee0df221219010f213ad429855f57c494f995590c861a9a7d8" dependencies = [ "arrayvec 0.7.6", "bit-set 0.8.0", @@ -6673,7 +6690,7 @@ dependencies = [ "cfg_aliases", "codespan-reporting", "half", - "hashbrown 0.15.5", + "hashbrown 0.16.0", "hexf-parse", "indexmap 2.12.0", "libm", @@ -6689,9 +6706,9 @@ dependencies = [ [[package]] name = "naga_oil" -version = "0.19.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b586d3cf5c9b7e13fe2af6e114406ff70773fd80881960378933b63e76f37dd" +checksum = "310c347db1b30e69581f3b84dc9a5c311ed583f67851b39b77953cb7a066c97f" dependencies = [ "codespan-reporting", "data-encoding", @@ -6719,9 +6736,9 @@ dependencies = [ [[package]] name = "native-dialog" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b63bf0e60ee0eca886b5df70269240b6197b6ee46ec37da9a7d28d8e8e24" +checksum = "454a816a8fed70bb5ba4ae90901073173dd5142f5df5ee503acde1ebcfaa4c4b" dependencies = [ "ascii", "block2 0.6.2", @@ -6961,11 +6978,10 @@ dependencies = [ [[package]] name = "num-bigint-dig" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +checksum = "82c79c15c05d4bf82b6f5ef163104cc81a760d8e874d38ac50ab67c8877b647b" dependencies = [ - "byteorder", "lazy_static", "libm", "num-integer", @@ -7000,7 +7016,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -7073,7 +7089,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -7524,7 +7540,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -7569,9 +7585,9 @@ dependencies = [ [[package]] name = "orbclient" -version = "0.3.48" +version = "0.3.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba0b26cec2e24f08ed8bb31519a9333140a6599b867dac464bb150bdb796fd43" +checksum = "247ad146e19b9437f8604c21f8652423595cf710ad108af40e77d3ae6e96b827" dependencies = [ "libredox", ] @@ -7659,7 +7675,7 @@ dependencies = [ "by_address", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -7697,7 +7713,7 @@ version = "0.1.0" dependencies = [ "assets-base", "assets-splitting", - "clap 4.5.50", + "clap 4.5.51", "image-utils", ] @@ -7785,7 +7801,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -7828,7 +7844,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", "unicase", ] @@ -7859,7 +7875,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -7976,9 +7992,9 @@ dependencies = [ [[package]] name = "potential_utf" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a" +checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77" dependencies = [ "zerovec", ] @@ -8049,7 +8065,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" dependencies = [ "proc-macro2", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -8098,7 +8114,7 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -8191,7 +8207,7 @@ checksum = "7347867d0a7e1208d93b46767be83e2b8f978c3dad35f775ac8d8847551d6fe1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -8600,7 +8616,7 @@ checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -8751,7 +8767,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots 1.0.3", + "webpki-roots 1.0.4", ] [[package]] @@ -8823,7 +8839,7 @@ checksum = "bd83f5f173ff41e00337d97f6572e416d022ef8a19f371817259ae960324c482" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -8989,9 +9005,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.34" +version = "0.23.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9586e9ee2b4f8fab52a0048ca7334d7024eef48e2cb9407e3497bb7cab7fa7" +checksum = "533f54bc6a7d4f647e46ad909549eda97bf5afc1585190ef692b4286b198bd8f" dependencies = [ "once_cell", "ring", @@ -9003,9 +9019,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79" +checksum = "94182ad936a0c91c324cd46c6511b9510ed16af436d7b5bab34beab0afd55f7a" dependencies = [ "web-time", "zeroize", @@ -9013,9 +9029,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.103.7" +version = "0.103.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e10b3f4191e8a80e6b43eebabfac91e5dcecebb27a71f04e820c47ec41d314bf" +checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52" dependencies = [ "ring", "rustls-pki-types", @@ -9041,9 +9057,9 @@ dependencies = [ [[package]] name = "ruzstd" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3640bec8aad418d7d03c72ea2de10d5c646a598f9883c7babc160d91e3c1b26c" +checksum = "e5ff0cc5e135c8870a775d3320910cd9b564ec036b4dc0b8741629020be63f01" dependencies = [ "twox-hash 2.1.2", ] @@ -9139,9 +9155,9 @@ dependencies = [ [[package]] name = "schemars" -version = "1.0.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0" +checksum = "9558e172d4e8533736ba97870c4b2cd63f84b382a3d6eb063da41b91cce17289" dependencies = [ "dyn-clone", "ref-cast", @@ -9158,7 +9174,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -9330,7 +9346,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -9341,7 +9357,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -9411,7 +9427,7 @@ dependencies = [ "indexmap 1.9.3", "indexmap 2.12.0", "schemars 0.9.0", - "schemars 1.0.4", + "schemars 1.1.0", "serde_core", "serde_json", "serde_with_macros", @@ -9427,7 +9443,7 @@ dependencies = [ "darling 0.21.3", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -9541,7 +9557,7 @@ name = "skin-convert" version = "0.1.0" dependencies = [ "assets-splitting", - "clap 4.5.50", + "clap 4.5.51", "image-utils", "rayon", ] @@ -9766,7 +9782,7 @@ dependencies = [ "quote", "sqlx-core", "sqlx-macros-core", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -9789,7 +9805,7 @@ dependencies = [ "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite", - "syn 2.0.108", + "syn 2.0.109", "tokio", "url", ] @@ -10070,7 +10086,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -10082,7 +10098,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -10234,9 +10250,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.108" +version = "2.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917" +checksum = "2f17c7e013e88258aa9543dcbe81aca68a667a9ac37cd69c9fbc07858bfe0e2f" dependencies = [ "proc-macro2", "quote", @@ -10260,14 +10276,14 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] name = "sysinfo" -version = "0.36.1" +version = "0.37.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "252800745060e7b9ffb7b2badbd8b31cfa4aa2e61af879d0a3bf2a317c20217d" +checksum = "16607d5caffd1c07ce073528f9ed972d88db15dd44023fa57142963be3feb11f" dependencies = [ "libc", "objc2-core-foundation", @@ -10321,9 +10337,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "target-triple" -version = "0.1.4" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ac9aa371f599d22256307c24a9d748c041e548cbf599f35d890f9d365361790" +checksum = "591ef38edfb78ca4771ee32cf494cb8771944bee237a9b91fc9c1424ac4b777b" [[package]] name = "tempfile" @@ -10403,7 +10419,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -10414,7 +10430,7 @@ checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -10527,9 +10543,9 @@ checksum = "abffc3150284599ddf14202b43742cf6efc731eaa39a851b84e4a98ae88623fe" [[package]] name = "tinystr" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b" +checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869" dependencies = [ "displaydoc", "zerovec", @@ -10568,7 +10584,7 @@ checksum = "2d2e76690929402faae40aebdda620a2c0e25dd6d3b9afe48867dfd95991f4bd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -10594,7 +10610,7 @@ checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -10630,9 +10646,9 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "489a59b6730eda1b0171fcfda8b121f4bee2b35cba8645ca35c5f7ba3eb736c1" +checksum = "d25a406cddcc431a75d3d9afc6a7c0f7428d4891dd973e4d54c56b46127bf857" dependencies = [ "futures-util", "log 0.4.28", @@ -10646,9 +10662,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.16" +version = "0.7.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5" +checksum = "2efa149fe76073d6e8fd97ef4f4eca7b67f599660115591483572e406e165594" dependencies = [ "bytes", "futures-core", @@ -10826,7 +10842,7 @@ checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -11049,9 +11065,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "trybuild" -version = "1.0.112" +version = "1.0.113" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d66678374d835fe847e0dc8348fde2ceb5be4a7ec204437d8367f0d8df266a5" +checksum = "559b6a626c0815c942ac98d434746138b4f89ddd6a1b8cbb168c6845fb3376c5" dependencies = [ "glob", "serde", @@ -11070,9 +11086,9 @@ checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31" [[package]] name = "tungstenite" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eadc29d668c91fcc564941132e17b28a7ceb2f3ebf0b9dae3e03fd7a6748eb0d" +checksum = "8628dcc84e5a09eb3d8423d6cb682965dea9133204e8fb3efee74c2a0c259442" dependencies = [ "bytes", "data-encoding", @@ -11193,24 +11209,24 @@ checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" [[package]] name = "unicode-ident" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "462eeb75aeb73aea900253ce739c8e18a67423fadf006037cd3ff27e82748a06" +checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" [[package]] name = "unicode-normalization" -version = "0.1.24" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" +checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8" dependencies = [ "tinyvec", ] [[package]] name = "unicode-properties" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" +checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d" [[package]] name = "unicode-segmentation" @@ -11537,9 +11553,9 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" [[package]] name = "wasm-bindgen" -version = "0.2.104" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d" +checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60" dependencies = [ "cfg-if", "once_cell", @@ -11548,25 +11564,11 @@ dependencies = [ "wasm-bindgen-shared", ] -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.104" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19" -dependencies = [ - "bumpalo", - "log 0.4.28", - "proc-macro2", - "quote", - "syn 2.0.108", - "wasm-bindgen-shared", -] - [[package]] name = "wasm-bindgen-futures" -version = "0.4.54" +version = "0.4.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e038d41e478cc73bae0ff9b36c60cff1c98b8f38f8d7e8061e79ee63608ac5c" +checksum = "551f88106c6d5e7ccc7cd9a16f312dd3b5d36ea8b4954304657d5dfba115d4a0" dependencies = [ "cfg-if", "js-sys", @@ -11577,9 +11579,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.104" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119" +checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -11587,22 +11589,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.104" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7" +checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc" dependencies = [ + "bumpalo", "proc-macro2", "quote", - "syn 2.0.108", - "wasm-bindgen-backend", + "syn 2.0.109", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.104" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1" +checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76" dependencies = [ "unicode-ident", ] @@ -11900,9 +11902,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.238.1" +version = "0.240.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fa99c8328024423875ae4a55345cfde8f0371327fb2d0f33b0f52a06fc44408" +checksum = "b722dcf61e0ea47440b53ff83ccb5df8efec57a69d150e4f24882e4eba7e24a4" dependencies = [ "bitflags 2.10.0", "hashbrown 0.15.5", @@ -12022,9 +12024,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.81" +version = "0.3.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9367c417a924a74cae129e6a2ae3b47fabb1f8995595ab474029da749a8be120" +checksum = "3a1f95c0d03a47f4ae1f7a64643a6bb97465d9b740f0fa8f90ea33915c99a9a1" dependencies = [ "js-sys", "wasm-bindgen", @@ -12090,14 +12092,14 @@ version = "0.26.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" dependencies = [ - "webpki-roots 1.0.3", + "webpki-roots 1.0.4", ] [[package]] name = "webpki-roots" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b130c0d2d49f8b6889abc456e795e82525204f27c42cf767cf0d7734e089b8" +checksum = "b2878ef029c47c6e8cf779119f20fcf52bde7ad42a731b2a304bc221df17571e" dependencies = [ "rustls-pki-types", ] @@ -12267,7 +12269,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -12278,7 +12280,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -12314,6 +12316,17 @@ dependencies = [ "windows-strings 0.4.2", ] +[[package]] +name = "windows-registry" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720" +dependencies = [ + "windows-link 0.2.1", + "windows-result 0.4.1", + "windows-strings 0.5.1", +] + [[package]] name = "windows-result" version = "0.1.2" @@ -12727,16 +12740,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "winreg" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - [[package]] name = "winsafe" version = "0.0.19" @@ -12751,9 +12754,9 @@ checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" [[package]] name = "writeable" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb" +checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" [[package]] name = "wyz" @@ -12784,7 +12787,7 @@ dependencies = [ "as-raw-xcb-connection", "gethostname", "libc", - "libloading", + "libloading 0.8.9", "once_cell", "rustix 1.1.2", "x11rb-protocol", @@ -12877,11 +12880,10 @@ dependencies = [ [[package]] name = "yoke" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc" +checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954" dependencies = [ - "serde", "stable_deref_trait", "yoke-derive", "zerofrom", @@ -12889,13 +12891,13 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" +checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", "synstructure", ] @@ -12926,7 +12928,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -12937,7 +12939,7 @@ checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -12957,7 +12959,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", "synstructure", ] @@ -12978,14 +12980,14 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] name = "zerotrie" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595" +checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851" dependencies = [ "displaydoc", "yoke", @@ -12994,9 +12996,9 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.11.4" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b" +checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002" dependencies = [ "yoke", "zerofrom", @@ -13005,20 +13007,20 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" +checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] name = "zip" -version = "5.1.1" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f852905151ac8d4d06fdca66520a661c09730a74c6d4e2b0f27b436b382e532" +checksum = "eb2a05c7c36fde6c09b08576c9f7fb4cda705990f73b58fe011abf7dfb24168b" dependencies = [ "arbitrary", "crc32fast", @@ -13036,9 +13038,9 @@ checksum = "2f06ae92f42f5e5c42443fd094f245eb656abf56dd7cce9b8b263236565e00f2" [[package]] name = "zopfli" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edfc5ee405f504cd4984ecc6f14d02d55cfda60fa4b689434ef4102aae150cd7" +checksum = "f05cd8797d63865425ff89b5c4a48804f35ba0ce8d125800027ad6017d2b5249" dependencies = [ "bumpalo", "crc32fast", diff --git a/Cargo.toml b/Cargo.toml index 0e2e6447..ad1f9112 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -246,14 +246,14 @@ bincode = { version = "2.0.1", features = ["serde"] } bytes = "1.10.1" chrono = { version = "0.4.42", features = ["serde"] } crossbeam = "0.8.4" -egui = { version = "0.32.3", default-features = false, features = ["serde"] } -egui-winit = { version = "0.32.3", default-features = false, features = [ +egui = { version = "0.33.0", default-features = false, features = ["serde"] } +egui-winit = { version = "0.33.0", default-features = false, features = [ "x11", "arboard", "links", ] } -egui_extras = { version = "0.32.3" } -emath = "0.32.3" +egui_extras = { version = "0.33.0" } +emath = "0.33.0" env_logger = "0.11.8" fixed = "1.29.0" hashlink = { git = "https://github.com/Jupeyy/hashlink/", branch = "ddnet", features = [ @@ -292,7 +292,7 @@ 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.2" +native-dialog = "0.9.3" [target.'cfg(target_os = "android")'.dependencies] android_logger = "0.15.1" diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index db305b39..b1e09c26 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -44,14 +44,24 @@ cargo install cargo-watch --locked --version 8.1.2 # Network Simulate network jitter, linux only: -sudo tc qdisc add dev lo root netem delay 100ms 10ms + +```bash +# increases the ping by 100ms per direction with a jitter of 10ms +sudo tc qdisc add dev lo root netem delay 100ms 10ms +# disables the artificial ping change sudo tc qdisc del dev lo root +``` # Sanitizers ASan & TSan (the `--target` flag is important here!, `+nightly` might be required (after cargo)): + +```bash +# ASan RUSTFLAGS="-Z sanitizer=address" cargo run --target x86_64-unknown-linux-gnu +# TSan TSAN_OPTIONS="ignore_noninstrumented_modules=1" RUSTFLAGS="-Z sanitizer=thread" cargo run --target x86_64-unknown-linux-gnu +``` # TOML formating @@ -67,9 +77,10 @@ Extensions like `tamasfe.even-better-toml` also allow to use them inside code ed # Linux helpers -Linux x11 mouse cursor while debugging: -install xdotool package -if you use the vscode workspace in misc/vscode it will do the following steps automatically +#### Linux x11 mouse cursor while debugging: +Install xdotool package. + +If you use the vscode workspace in misc/vscode it will do the following steps automatically lldb has to execute this add start of debugging: diff --git a/README.md b/README.md index f8b45c78..92a831ea 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,8 @@ Features -------- Some features require you to compile DDNet-rs with explicit features: -``` + +```bash cargo run --release --features bundled_data_dir,ffmpeg,microphone,enable_steam ``` @@ -33,7 +34,7 @@ cargo run --release --features bundled_data_dir,ffmpeg,microphone,enable_steam Android ------- -``` +```bash # using https://github.com/rust-mobile/xbuild x build --release --arch arm64 --platform android --format apk -p ddnet-rs --features bundled_data_dir ``` diff --git a/examples/lib-modules/editor-lib/Cargo.toml b/examples/lib-modules/editor-lib/Cargo.toml index e46a2764..8107a6f1 100644 --- a/examples/lib-modules/editor-lib/Cargo.toml +++ b/examples/lib-modules/editor-lib/Cargo.toml @@ -14,6 +14,6 @@ config = { path = "../../../lib/config" } graphics = { path = "../../../lib/graphics" } sound = { path = "../../../lib/sound" } -egui = { version = "0.32.3", default-features = false, features = ["serde"] } +egui = { version = "0.33.0", default-features = false, features = ["serde"] } once_cell = "1.21.3" rayon = "1.11.0" diff --git a/examples/wasm-modules/actionfeed/Cargo.toml b/examples/wasm-modules/actionfeed/Cargo.toml index 4293945f..b1f8b10d 100644 --- a/examples/wasm-modules/actionfeed/Cargo.toml +++ b/examples/wasm-modules/actionfeed/Cargo.toml @@ -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.3", default-features = false, features = ["serde"] } +egui = { version = "0.33.0", default-features = false, features = ["serde"] } num-traits = "0.2.19" diff --git a/examples/wasm-modules/chat/Cargo.toml b/examples/wasm-modules/chat/Cargo.toml index 301e4a6c..fb06f20f 100644 --- a/examples/wasm-modules/chat/Cargo.toml +++ b/examples/wasm-modules/chat/Cargo.toml @@ -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.3", default-features = false, features = ["serde"] } +egui = { version = "0.33.0", default-features = false, features = ["serde"] } diff --git a/examples/wasm-modules/connecting/Cargo.toml b/examples/wasm-modules/connecting/Cargo.toml index c151769a..c240bb8e 100644 --- a/examples/wasm-modules/connecting/Cargo.toml +++ b/examples/wasm-modules/connecting/Cargo.toml @@ -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.3", default-features = false, features = ["serde"] } +egui = { version = "0.33.0", default-features = false, features = ["serde"] } diff --git a/examples/wasm-modules/console/Cargo.toml b/examples/wasm-modules/console/Cargo.toml index 5db7870f..5a9d564e 100644 --- a/examples/wasm-modules/console/Cargo.toml +++ b/examples/wasm-modules/console/Cargo.toml @@ -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.3", default-features = false, features = ["serde"] } +egui = { version = "0.33.0", default-features = false, features = ["serde"] } diff --git a/examples/wasm-modules/demo_player/Cargo.toml b/examples/wasm-modules/demo_player/Cargo.toml index a5ac423a..a475ad73 100644 --- a/examples/wasm-modules/demo_player/Cargo.toml +++ b/examples/wasm-modules/demo_player/Cargo.toml @@ -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.3", default-features = false, features = ["serde"] } +egui = { version = "0.33.0", default-features = false, features = ["serde"] } diff --git a/examples/wasm-modules/emote_wheel/Cargo.toml b/examples/wasm-modules/emote_wheel/Cargo.toml index ed903eb0..f1fd30d6 100644 --- a/examples/wasm-modules/emote_wheel/Cargo.toml +++ b/examples/wasm-modules/emote_wheel/Cargo.toml @@ -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.3", default-features = false, features = ["serde"] } +egui = { version = "0.33.0", default-features = false, features = ["serde"] } diff --git a/examples/wasm-modules/hud/Cargo.toml b/examples/wasm-modules/hud/Cargo.toml index 782dcd4b..8d420bee 100644 --- a/examples/wasm-modules/hud/Cargo.toml +++ b/examples/wasm-modules/hud/Cargo.toml @@ -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.3", default-features = false, features = ["serde"] } +egui = { version = "0.33.0", default-features = false, features = ["serde"] } diff --git a/examples/wasm-modules/ingame_menu/Cargo.toml b/examples/wasm-modules/ingame_menu/Cargo.toml index 1915d2c0..a768967f 100644 --- a/examples/wasm-modules/ingame_menu/Cargo.toml +++ b/examples/wasm-modules/ingame_menu/Cargo.toml @@ -24,6 +24,6 @@ game-interface = { path = "../../../game/game-interface" } anyhow = { version = "1.0.100", features = ["backtrace"] } async-trait = "0.1.89" -egui = { version = "0.32.3", default-features = false, features = ["serde"] } +egui = { version = "0.33.0", default-features = false, features = ["serde"] } email_address = { version = "0.2.9", features = ["serde"] } serde_json = "1.0.145" diff --git a/examples/wasm-modules/mainmenu/Cargo.toml b/examples/wasm-modules/mainmenu/Cargo.toml index 40e43e70..c8b73732 100644 --- a/examples/wasm-modules/mainmenu/Cargo.toml +++ b/examples/wasm-modules/mainmenu/Cargo.toml @@ -23,6 +23,6 @@ game-config = { path = "../../../game/game-config" } anyhow = { version = "1.0.100", features = ["backtrace"] } async-trait = "0.1.89" -egui = { version = "0.32.3", default-features = false, features = ["serde"] } +egui = { version = "0.33.0", default-features = false, features = ["serde"] } email_address = { version = "0.2.9", features = ["serde"] } serde_json = "1.0.145" diff --git a/examples/wasm-modules/motd/Cargo.toml b/examples/wasm-modules/motd/Cargo.toml index 845cd1f5..3e464f2b 100644 --- a/examples/wasm-modules/motd/Cargo.toml +++ b/examples/wasm-modules/motd/Cargo.toml @@ -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.3", default-features = false, features = ["serde"] } +egui = { version = "0.33.0", default-features = false, features = ["serde"] } diff --git a/examples/wasm-modules/prediction_timer_ui/Cargo.toml b/examples/wasm-modules/prediction_timer_ui/Cargo.toml index 33503953..6ae7c777 100644 --- a/examples/wasm-modules/prediction_timer_ui/Cargo.toml +++ b/examples/wasm-modules/prediction_timer_ui/Cargo.toml @@ -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.3", default-features = false, features = ["serde"] } -egui_plot = { version = "0.33.0" } +egui = { version = "0.33.0", default-features = false, features = ["serde"] } +egui_plot = { version = "0.34.0" } diff --git a/examples/wasm-modules/scoreboard/Cargo.toml b/examples/wasm-modules/scoreboard/Cargo.toml index 025cb87d..ae571a39 100644 --- a/examples/wasm-modules/scoreboard/Cargo.toml +++ b/examples/wasm-modules/scoreboard/Cargo.toml @@ -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.3", default-features = false, features = ["serde"] } +egui = { version = "0.33.0", default-features = false, features = ["serde"] } diff --git a/examples/wasm-modules/ui/Cargo.toml b/examples/wasm-modules/ui/Cargo.toml index a8fa0be9..1a0a38ed 100644 --- a/examples/wasm-modules/ui/Cargo.toml +++ b/examples/wasm-modules/ui/Cargo.toml @@ -13,4 +13,4 @@ ui-generic = { path = "../../../lib/ui-generic" } api-ui-game = { path = "../../../game/api-ui-game" } -egui = { version = "0.32.3", default-features = false, features = ["serde"] } +egui = { version = "0.33.0", default-features = false, features = ["serde"] } diff --git a/examples/wasm-modules/vote/Cargo.toml b/examples/wasm-modules/vote/Cargo.toml index 4ee49c75..28573c68 100644 --- a/examples/wasm-modules/vote/Cargo.toml +++ b/examples/wasm-modules/vote/Cargo.toml @@ -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.3", default-features = false, features = ["serde"] } +egui = { version = "0.33.0", default-features = false, features = ["serde"] } diff --git a/game/api-editor/Cargo.toml b/game/api-editor/Cargo.toml index 82e7c7e1..4a981bf3 100644 --- a/game/api-editor/Cargo.toml +++ b/game/api-editor/Cargo.toml @@ -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.3", default-features = false, features = ["serde"] } +egui = { version = "0.33.0", default-features = false, features = ["serde"] } once_cell = "1.21.3" diff --git a/game/client-console/Cargo.toml b/game/client-console/Cargo.toml index 803f9653..738115d0 100644 --- a/game/client-console/Cargo.toml +++ b/game/client-console/Cargo.toml @@ -23,7 +23,7 @@ ui-base = { path = "../../lib/ui-base" } ui-generic = { path = "../../lib/ui-generic" } anyhow = { version = "1.0.100", features = ["backtrace"] } -egui = { version = "0.32.3", default-features = false, features = ["serde"] } +egui = { version = "0.33.0", default-features = false, features = ["serde"] } log = "0.4.28" tracing = { version = "0.1.41", default-features = false, features = [ "attributes", diff --git a/game/client-demo/Cargo.toml b/game/client-demo/Cargo.toml index fc4b0641..26e75107 100644 --- a/game/client-demo/Cargo.toml +++ b/game/client-demo/Cargo.toml @@ -32,7 +32,7 @@ game-config = { path = "../game-config" } game-interface = { path = "../game-interface" } anyhow = { version = "1.0.100", features = ["backtrace"] } -egui = { version = "0.32.3", default-features = false, features = ["serde"] } +egui = { version = "0.33.0", default-features = false, features = ["serde"] } log = "0.4.28" rayon = "1.11.0" serde = { version = "1.0.228", features = ["derive"] } diff --git a/game/client-map/Cargo.toml b/game/client-map/Cargo.toml index d956cf2f..93f740e8 100644 --- a/game/client-map/Cargo.toml +++ b/game/client-map/Cargo.toml @@ -27,4 +27,4 @@ rayon = "1.11.0" tracing = { version = "0.1.41", default-features = false, features = [ "attributes", ] } -wasmparser = "0.238.1" +wasmparser = "0.240.0" diff --git a/game/client-notifications/Cargo.toml b/game/client-notifications/Cargo.toml index 5ad9acee..6dad0555 100644 --- a/game/client-notifications/Cargo.toml +++ b/game/client-notifications/Cargo.toml @@ -9,8 +9,8 @@ graphics = { path = "../../lib/graphics" } ui-base = { path = "../../lib/ui-base" } ui-generic = { path = "../../lib/ui-generic" } -egui = { version = "0.32.3", default-features = false, features = ["serde"] } -egui-notify = "0.20.0" +egui = { version = "0.33.0", default-features = false, features = ["serde"] } +egui-notify = "0.21.0" tracing = { version = "0.1.41", default-features = false, features = [ "attributes", ] } diff --git a/game/client-render-game/Cargo.toml b/game/client-render-game/Cargo.toml index 201a2f52..8b198ed8 100644 --- a/game/client-render-game/Cargo.toml +++ b/game/client-render-game/Cargo.toml @@ -26,7 +26,7 @@ game-interface = { path = "../game-interface" } map = { path = "../map" } vanilla = { path = "../vanilla" } -egui = { version = "0.32.3", default-features = false, features = ["serde"] } +egui = { version = "0.33.0", default-features = false, features = ["serde"] } num-traits = "0.2.19" rayon = "1.11.0" serde = { version = "1.0.228", features = ["derive"] } diff --git a/game/client-render/Cargo.toml b/game/client-render/Cargo.toml index 0fb964f2..ea0d85f8 100644 --- a/game/client-render/Cargo.toml +++ b/game/client-render/Cargo.toml @@ -18,5 +18,5 @@ client-ui = { path = "../client-ui" } game-base = { path = "../game-base" } game-interface = { path = "../game-interface" } -egui = { version = "0.32.3", default-features = false, features = ["serde"] } +egui = { version = "0.33.0", default-features = false, features = ["serde"] } serde = { version = "1.0.228", features = ["derive"] } diff --git a/game/client-render/src/nameplates/render.rs b/game/client-render/src/nameplates/render.rs index 8e52bd4b..ee899b22 100644 --- a/game/client-render/src/nameplates/render.rs +++ b/game/client-render/src/nameplates/render.rs @@ -77,7 +77,7 @@ impl NameplateRender { } in &mut *pipe.players { ui.set_opacity(phased_alpha); - let size = ui.ctx().screen_rect().size(); + let size = ui.ctx().content_rect().size(); let (x0, y0, x1, y1) = pipe.state.get_canvas_mapping(); let w = x1 - x0; diff --git a/game/client-replay/Cargo.toml b/game/client-replay/Cargo.toml index dd400b4e..597fe627 100644 --- a/game/client-replay/Cargo.toml +++ b/game/client-replay/Cargo.toml @@ -11,5 +11,5 @@ demo = { path = "../demo", features = ["recorder"] } game-interface = { path = "../game-interface" } anyhow = { version = "1.0.100", features = ["backtrace"] } -egui = { version = "0.32.3", default-features = false, features = ["serde"] } +egui = { version = "0.33.0", default-features = false, features = ["serde"] } rayon = "1.11.0" diff --git a/game/client-ui/Cargo.toml b/game/client-ui/Cargo.toml index f7515677..3cace403 100644 --- a/game/client-ui/Cargo.toml +++ b/game/client-ui/Cargo.toml @@ -35,9 +35,9 @@ ui-generic = { path = "../../lib/ui-generic" } anyhow = { version = "1.0.100", features = ["backtrace"] } async-trait = "0.1.89" -egui = { version = "0.32.3", default-features = false, features = ["serde"] } -egui_commonmark = "0.21.1" -egui_extras = { version = "0.32.3" } +egui = { version = "0.33.0", default-features = false, features = ["serde"] } +egui_commonmark = "0.22.0" +egui_extras = { version = "0.33.0" } email_address = { version = "0.2.9", features = ["serde"] } fuzzy-matcher = "0.3.7" gcd = "2.3.0" diff --git a/game/client-ui/src/chat/chat_entry.rs b/game/client-ui/src/chat/chat_entry.rs index 75f5a0cb..b8e2f95b 100644 --- a/game/client-ui/src/chat/chat_entry.rs +++ b/game/client-ui/src/chat/chat_entry.rs @@ -80,7 +80,7 @@ pub fn render( pipe.user_data.render_tee, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(ui.clip_rect()), to.skin.borrow(), Some(&to.skin_info), @@ -106,7 +106,7 @@ pub fn render( pipe.user_data.render_tee, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(ui.clip_rect()), &msg.skin_name, Some(&msg.skin_info), diff --git a/game/client-ui/src/chat/input.rs b/game/client-ui/src/chat/input.rs index f5ffa550..0057f53a 100644 --- a/game/client-ui/src/chat/input.rs +++ b/game/client-ui/src/chat/input.rs @@ -73,7 +73,7 @@ fn render_inner(ui: &mut egui::Ui, ui_state: &mut UiState, pipe: &mut UiRenderPi pipe.user_data.render_tee, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), None, to.info.skin.borrow(), Some(&to.info.skin_info), @@ -221,7 +221,7 @@ fn render_inner(ui: &mut egui::Ui, ui_state: &mut UiState, pipe: &mut UiRenderPi pipe.user_data.render_tee, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), None, msg_char.info.skin.borrow(), Some(&msg_char.info.skin_info), diff --git a/game/client-ui/src/chat/system_entry.rs b/game/client-ui/src/chat/system_entry.rs index ab627fa6..784f04c7 100644 --- a/game/client-ui/src/chat/system_entry.rs +++ b/game/client-ui/src/chat/system_entry.rs @@ -68,7 +68,7 @@ pub fn render( pipe.user_data.render_tee, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(ui.clip_rect()), &skin.skin_name, Some(&skin.skin_info), @@ -87,7 +87,7 @@ pub fn render( pipe.user_data.render_tee, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(ui.clip_rect()), &skin.skin_name, Some(&skin.skin_info), diff --git a/game/client-ui/src/console/input.rs b/game/client-ui/src/console/input.rs index 18525aa6..de8b2dea 100644 --- a/game/client-ui/src/console/input.rs +++ b/game/client-ui/src/console/input.rs @@ -222,7 +222,7 @@ pub fn render( } } colorize_semicolons(&mut layout_job, last_range..string.len()); - ui.fonts(|f| f.layout_job(layout_job)) + ui.fonts_mut(|f| f.layout_job(layout_job)) }; let had_quote = pipe.user_data.msg.char_indices().any(|(index, c)| { if c == '"' { diff --git a/game/client-ui/src/demo_player/main_frame.rs b/game/client-ui/src/demo_player/main_frame.rs index add1efd3..2f4713d2 100644 --- a/game/client-ui/src/demo_player/main_frame.rs +++ b/game/client-ui/src/demo_player/main_frame.rs @@ -30,7 +30,7 @@ pub fn render(ui: &mut egui::Ui, pipe: &mut UiRenderPipe, ui_state: &m .show_separator_line(false) .resizable(false) .show(ui.ctx(), |ui| { - ui.set_clip_rect(ui.ctx().screen_rect()); + ui.set_clip_rect(ui.ctx().content_rect()); ui.style_mut().spacing.item_spacing.y = 0.0; let mut rect = ui.available_rect_before_wrap(); ui.add_space(10.0); @@ -72,7 +72,7 @@ pub fn render(ui: &mut egui::Ui, pipe: &mut UiRenderPipe, ui_state: &m .clamp(0.0, f64::MAX), ); - let canvas = ui.ctx().screen_rect(); + let canvas = ui.ctx().content_rect(); let canvas_width = canvas.width(); let canvas_height = canvas.height(); let ratio = canvas_width / canvas_height; diff --git a/game/client-ui/src/emote_wheel/main_frame.rs b/game/client-ui/src/emote_wheel/main_frame.rs index 042da8ba..e7e85aa2 100644 --- a/game/client-ui/src/emote_wheel/main_frame.rs +++ b/game/client-ui/src/emote_wheel/main_frame.rs @@ -18,7 +18,7 @@ use super::user_data::{EmoteWheelEvent, UserData}; /// not required #[instrument(level = "trace", skip_all)] pub fn render(ui: &mut egui::Ui, pipe: &mut UiRenderPipe, ui_state: &mut UiState) { - let rect = ui.ctx().screen_rect(); + let rect = ui.ctx().content_rect(); let width_scale = rect.width() / pipe.user_data.canvas_handle.canvas_width() as f32; diff --git a/game/client-ui/src/hud/main_frame.rs b/game/client-ui/src/hud/main_frame.rs index 1762040e..0e310b32 100644 --- a/game/client-ui/src/hud/main_frame.rs +++ b/game/client-ui/src/hud/main_frame.rs @@ -196,7 +196,7 @@ pub fn render(ui: &mut egui::Ui, pipe: &mut UiRenderPipe, ui_state: &m }, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(ui.clip_rect()), vec2::new( rect.center().x, @@ -213,7 +213,7 @@ pub fn render(ui: &mut egui::Ui, pipe: &mut UiRenderPipe, ui_state: &m data.skin_renderer, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(rect), character.info.skin.borrow(), Some(&character.skin_info), @@ -437,7 +437,7 @@ pub fn render(ui: &mut egui::Ui, pipe: &mut UiRenderPipe, ui_state: &m .anchor(Align2::CENTER_TOP, Vec2::new(0.0, 5.0)) .max_height(max_height) .show(ui.ctx(), |ui| { - ui.set_clip_rect(ui.ctx().screen_rect()); + ui.set_clip_rect(ui.ctx().content_rect()); ui.style_mut().spacing.item_spacing.y = 0.0; let rect = ui .with_layout( @@ -474,7 +474,7 @@ pub fn render(ui: &mut egui::Ui, pipe: &mut UiRenderPipe, ui_state: &m pipe.user_data.skin_renderer, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(rect), (*char.skin).borrow(), Some(&char.skin_info), @@ -572,10 +572,10 @@ pub fn render(ui: &mut egui::Ui, pipe: &mut UiRenderPipe, ui_state: &m UiBuilder::default().max_rect( res.map(|r| { ui.ctx() - .screen_rect() + .content_rect() .translate(egui::vec2(0.0, r.response.rect.height())) }) - .unwrap_or_else(|| ui.ctx().screen_rect()), + .unwrap_or_else(|| ui.ctx().content_rect()), ), |ui| { ui.with_layout( diff --git a/game/client-ui/src/ingame_menu/call_vote/map.rs b/game/client-ui/src/ingame_menu/call_vote/map.rs index 19b152f9..1855cd91 100644 --- a/game/client-ui/src/ingame_menu/call_vote/map.rs +++ b/game/client-ui/src/ingame_menu/call_vote/map.rs @@ -498,7 +498,7 @@ pub fn render(ui: &mut egui::Ui, pipe: &mut UiRenderPipe, ui_state: &m &thumbnail.thumbnail, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(ui.clip_rect()), pos, vec2::new(width * scale, height * scale), diff --git a/game/client-ui/src/main_menu/communities/list.rs b/game/client-ui/src/main_menu/communities/list.rs index 3ac63c2b..758c39dd 100644 --- a/game/client-ui/src/main_menu/communities/list.rs +++ b/game/client-ui/src/main_menu/communities/list.rs @@ -66,7 +66,7 @@ pub fn community_list( thumbnail, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(ui.clip_rect()), pos, vec2::new(asset_size / ratio_w, asset_size / ratio_h), diff --git a/game/client-ui/src/main_menu/content/browser/connect_refresh.rs b/game/client-ui/src/main_menu/content/browser/connect_refresh.rs index 2e3deb29..d46cf5c6 100644 --- a/game/client-ui/src/main_menu/content/browser/connect_refresh.rs +++ b/game/client-ui/src/main_menu/content/browser/connect_refresh.rs @@ -9,7 +9,7 @@ use crate::{events::UiEvent, main_menu::user_data::UserData}; /// connect & refresh button pub fn render(ui: &mut egui::Ui, pipe: &mut UiRenderPipe) { ui.horizontal(|ui| { - ui.set_clip_rect(ui.ctx().screen_rect()); + ui.set_clip_rect(ui.ctx().content_rect()); let server_addr_str = pipe.user_data.config.storage::("server-addr"); let server_addr: Result = server_addr_str.parse(); diff --git a/game/client-ui/src/main_menu/content/browser/filter.rs b/game/client-ui/src/main_menu/content/browser/filter.rs index 9b899ca0..004bc662 100644 --- a/game/client-ui/src/main_menu/content/browser/filter.rs +++ b/game/client-ui/src/main_menu/content/browser/filter.rs @@ -100,7 +100,7 @@ pub fn render(ui: &mut egui::Ui, pipe: &mut UiRenderPipe, ui_state: &m pipe.user_data.flags_container, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(ui.available_rect_before_wrap()), &key, &name.to_lowercase().replace("-", "_"), diff --git a/game/client-ui/src/main_menu/content/browser/friend_list/list/entry.rs b/game/client-ui/src/main_menu/content/browser/friend_list/list/entry.rs index 1c479302..f7b9ff9a 100644 --- a/game/client-ui/src/main_menu/content/browser/friend_list/list/entry.rs +++ b/game/client-ui/src/main_menu/content/browser/friend_list/list/entry.rs @@ -26,7 +26,7 @@ pub fn render( pipe.user_data.render_tee, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(rect), favorite.skin.borrow(), Some(&favorite.skin_info), @@ -50,7 +50,7 @@ pub fn render( pipe.user_data.flags_container, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(rect), &key, &favorite.flag, diff --git a/game/client-ui/src/main_menu/content/browser/main_frame.rs b/game/client-ui/src/main_menu/content/browser/main_frame.rs index 2d68d760..ac218c13 100644 --- a/game/client-ui/src/main_menu/content/browser/main_frame.rs +++ b/game/client-ui/src/main_menu/content/browser/main_frame.rs @@ -78,7 +78,7 @@ pub fn render( .find_str(&pipe.user_data.config.storage::("server-addr")); super::info_panel::main_frame::render( ui, - &ui.ctx().screen_rect().clone(), + &ui.ctx().content_rect().clone(), &mut UiRenderPipe { cur_time: pipe.cur_time, user_data: &mut EntryData { diff --git a/game/client-ui/src/main_menu/leftbar/main_frame.rs b/game/client-ui/src/main_menu/leftbar/main_frame.rs index a39c6dcb..e8fdba0b 100644 --- a/game/client-ui/src/main_menu/leftbar/main_frame.rs +++ b/game/client-ui/src/main_menu/leftbar/main_frame.rs @@ -124,7 +124,7 @@ pub fn render( thumbnail, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(clip_rect), vec2::new(rect.center().x, rect.center().y), vec2::new(rect.width() / ratio_w, rect.height() / ratio_h), @@ -176,7 +176,7 @@ pub fn render( user_data.render_tee, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(clip_rect), &profile.name.as_str().try_into().unwrap_or_default(), profile diff --git a/game/client-ui/src/main_menu/profile/account_info.rs b/game/client-ui/src/main_menu/profile/account_info.rs index cea30a57..70362eda 100644 --- a/game/client-ui/src/main_menu/profile/account_info.rs +++ b/game/client-ui/src/main_menu/profile/account_info.rs @@ -186,7 +186,7 @@ pub fn render( user_data.render_tee, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(ui.clip_rect()), &ResourceKey::from_str_lossy(skin_preview.name.as_str()), Some(&skin_info), diff --git a/game/client-ui/src/main_menu/settings/general/themes.rs b/game/client-ui/src/main_menu/settings/general/themes.rs index 42d585cc..5c5a4083 100644 --- a/game/client-ui/src/main_menu/settings/general/themes.rs +++ b/game/client-ui/src/main_menu/settings/general/themes.rs @@ -39,7 +39,7 @@ pub fn theme_list(ui: &mut egui::Ui, pipe: &mut UiRenderPipe, ui_state &theme.thumbnail, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(ui.clip_rect()), pos, vec2::new(asset_size, asset_size / 2.0), diff --git a/game/client-ui/src/main_menu/settings/language/list.rs b/game/client-ui/src/main_menu/settings/language/list.rs index 8a44d1a0..c3dea1cc 100644 --- a/game/client-ui/src/main_menu/settings/language/list.rs +++ b/game/client-ui/src/main_menu/settings/language/list.rs @@ -55,7 +55,7 @@ pub fn lang_list(ui: &mut egui::Ui, pipe: &mut UiRenderPipe, ui_state: pipe.user_data.flags_container, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(ui.clip_rect()), &flag, name, diff --git a/game/client-ui/src/main_menu/settings/player/assets/ctf.rs b/game/client-ui/src/main_menu/settings/player/assets/ctf.rs index 764a491c..0c5ecb47 100644 --- a/game/client-ui/src/main_menu/settings/player/assets/ctf.rs +++ b/game/client-ui/src/main_menu/settings/player/assets/ctf.rs @@ -53,7 +53,7 @@ pub fn ctf_list( texture, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(ui.clip_rect()), pos + vec2::new(x * item_size, 0.0), vec2::new(item_size, asset_size), diff --git a/game/client-ui/src/main_menu/settings/player/assets/emoticons.rs b/game/client-ui/src/main_menu/settings/player/assets/emoticons.rs index 04f3b9cb..2a43dcd2 100644 --- a/game/client-ui/src/main_menu/settings/player/assets/emoticons.rs +++ b/game/client-ui/src/main_menu/settings/player/assets/emoticons.rs @@ -55,7 +55,7 @@ pub fn emoticons_list( pipe.user_data.emoticons_container, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(ui.clip_rect()), &name.try_into().unwrap_or_default(), pos + vec2::new(x * emoticons_size, y * emoticons_size), diff --git a/game/client-ui/src/main_menu/settings/player/assets/entities.rs b/game/client-ui/src/main_menu/settings/player/assets/entities.rs index 080cfa13..75fce93c 100644 --- a/game/client-ui/src/main_menu/settings/player/assets/entities.rs +++ b/game/client-ui/src/main_menu/settings/player/assets/entities.rs @@ -51,7 +51,7 @@ pub fn entities_list( tile_set_preview.base.obj.shader_storage.clone().unwrap(), ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(ui.clip_rect()), &name.try_into().unwrap_or_default(), pos, diff --git a/game/client-ui/src/main_menu/settings/player/assets/freeze.rs b/game/client-ui/src/main_menu/settings/player/assets/freeze.rs index 7c7dc048..564182e0 100644 --- a/game/client-ui/src/main_menu/settings/player/assets/freeze.rs +++ b/game/client-ui/src/main_menu/settings/player/assets/freeze.rs @@ -48,7 +48,7 @@ pub fn freeze_list( &freeze.freeze_bar_full_left, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(ui.clip_rect()), vec2::new(pos.x - single_size / 2.0 - single_size, pos.y), vec2::new(single_size, single_size), @@ -60,7 +60,7 @@ pub fn freeze_list( &freeze.freeze_bar_full, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(ui.clip_rect()), vec2::new(pos.x - single_size / 2.0, pos.y), vec2::new(single_size, single_size), @@ -72,7 +72,7 @@ pub fn freeze_list( &freeze.freeze_bar_empty, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(ui.clip_rect()), vec2::new(pos.x + single_size / 2.0, pos.y), vec2::new(single_size, single_size), @@ -84,7 +84,7 @@ pub fn freeze_list( &freeze.freeze_bar_empty_right, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(ui.clip_rect()), vec2::new(pos.x + single_size / 2.0 + single_size, pos.y), vec2::new(single_size, single_size), diff --git a/game/client-ui/src/main_menu/settings/player/assets/game.rs b/game/client-ui/src/main_menu/settings/player/assets/game.rs index 83b2beb8..201232fe 100644 --- a/game/client-ui/src/main_menu/settings/player/assets/game.rs +++ b/game/client-ui/src/main_menu/settings/player/assets/game.rs @@ -58,7 +58,7 @@ pub fn game_list( texture, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(ui.clip_rect()), pos + vec2::new(x * item_size, y * item_size), vec2::new(item_size, item_size), diff --git a/game/client-ui/src/main_menu/settings/player/assets/hook.rs b/game/client-ui/src/main_menu/settings/player/assets/hook.rs index 05c8bbb2..fb0b5783 100644 --- a/game/client-ui/src/main_menu/settings/player/assets/hook.rs +++ b/game/client-ui/src/main_menu/settings/player/assets/hook.rs @@ -44,7 +44,7 @@ pub fn hook_list( pipe.user_data.toolkit_render, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(ui.clip_rect()), &name.try_into().unwrap_or_default(), pos, diff --git a/game/client-ui/src/main_menu/settings/player/assets/hud.rs b/game/client-ui/src/main_menu/settings/player/assets/hud.rs index 0f7dac6d..a0001048 100644 --- a/game/client-ui/src/main_menu/settings/player/assets/hud.rs +++ b/game/client-ui/src/main_menu/settings/player/assets/hud.rs @@ -58,7 +58,7 @@ pub fn hud_list( texture, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(ui.clip_rect()), pos + vec2::new(x * item_size, y * item_size), vec2::new(item_size, item_size), diff --git a/game/client-ui/src/main_menu/settings/player/assets/ninja.rs b/game/client-ui/src/main_menu/settings/player/assets/ninja.rs index 6202e5f0..b899d409 100644 --- a/game/client-ui/src/main_menu/settings/player/assets/ninja.rs +++ b/game/client-ui/src/main_menu/settings/player/assets/ninja.rs @@ -51,7 +51,7 @@ pub fn ninja_list( pipe.user_data.render_tee, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(ui.clip_rect()), Some(&skin_info), pos, diff --git a/game/client-ui/src/main_menu/settings/player/assets/particles.rs b/game/client-ui/src/main_menu/settings/player/assets/particles.rs index 4d770102..353ce2c8 100644 --- a/game/client-ui/src/main_menu/settings/player/assets/particles.rs +++ b/game/client-ui/src/main_menu/settings/player/assets/particles.rs @@ -58,7 +58,7 @@ pub fn particles_list( texture, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(ui.clip_rect()), pos + vec2::new(x * item_size, y * item_size), vec2::new(item_size, item_size), diff --git a/game/client-ui/src/main_menu/settings/player/assets/weapons.rs b/game/client-ui/src/main_menu/settings/player/assets/weapons.rs index 7b1bcf27..1cfada11 100644 --- a/game/client-ui/src/main_menu/settings/player/assets/weapons.rs +++ b/game/client-ui/src/main_menu/settings/player/assets/weapons.rs @@ -50,7 +50,7 @@ pub fn weapon_list( pipe.user_data.toolkit_render, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(ui.clip_rect()), &name.try_into().unwrap_or_default(), weapon, diff --git a/game/client-ui/src/main_menu/settings/player/main_frame.rs b/game/client-ui/src/main_menu/settings/player/main_frame.rs index 081fd1b6..9a0b5497 100644 --- a/game/client-ui/src/main_menu/settings/player/main_frame.rs +++ b/game/client-ui/src/main_menu/settings/player/main_frame.rs @@ -92,7 +92,7 @@ pub fn render(ui: &mut egui::Ui, pipe: &mut UiRenderPipe, ui_state: &m pipe.user_data.render_tee, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(ui.clip_rect()), &skin_name.as_str().try_into().unwrap_or_default(), Some(&skin_info), diff --git a/game/client-ui/src/main_menu/settings/player/misc/main_frame.rs b/game/client-ui/src/main_menu/settings/player/misc/main_frame.rs index 105290b7..ac901a82 100644 --- a/game/client-ui/src/main_menu/settings/player/misc/main_frame.rs +++ b/game/client-ui/src/main_menu/settings/player/misc/main_frame.rs @@ -99,7 +99,7 @@ pub fn render(ui: &mut egui::Ui, pipe: &mut UiRenderPipe, ui_state: &m pipe.user_data.flags_container, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(ui.clip_rect()), &default_key, &name.to_lowercase().replace("-", "_"), diff --git a/game/client-ui/src/main_menu/settings/player/tee/main_frame.rs b/game/client-ui/src/main_menu/settings/player/tee/main_frame.rs index 92e82808..1589d941 100644 --- a/game/client-ui/src/main_menu/settings/player/tee/main_frame.rs +++ b/game/client-ui/src/main_menu/settings/player/tee/main_frame.rs @@ -80,7 +80,7 @@ pub fn render_skin( render_tee, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(ui.clip_rect()), &ResourceKey::from_str_lossy(skin_name), Some(&skin_info), @@ -167,7 +167,7 @@ pub fn render_skin( render_tee, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(ui.clip_rect()), &ResourceKey::from_str_lossy(skin_name), Some(&skin_info), @@ -226,7 +226,7 @@ pub fn render_skin( render_tee, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(ui.clip_rect()), &name.try_into().unwrap_or_default(), Some(&skin_info), diff --git a/game/client-ui/src/vote/main_frame.rs b/game/client-ui/src/vote/main_frame.rs index 2664f8ad..6ef13202 100644 --- a/game/client-ui/src/vote/main_frame.rs +++ b/game/client-ui/src/vote/main_frame.rs @@ -24,8 +24,8 @@ use super::user_data::{UserData, VoteRenderType}; /// not required #[instrument(level = "trace", skip_all)] pub fn render(ui: &mut egui::Ui, pipe: &mut UiRenderPipe, ui_state: &mut UiState) { - let full_rect = ui.ctx().screen_rect(); - let mut rect = ui.ctx().screen_rect(); + let full_rect = ui.ctx().content_rect(); + let mut rect = ui.ctx().content_rect(); // 15% + some etra offset for the hud let x_offset = 10.0; @@ -266,7 +266,7 @@ pub fn render(ui: &mut egui::Ui, pipe: &mut UiRenderPipe, ui_state: &m &thumbnail.thumbnail, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(ui.clip_rect()), vec2::new(center.x, center.y), vec2::new(width * scale, height * scale), diff --git a/game/editor-wasm/Cargo.toml b/game/editor-wasm/Cargo.toml index 8a85acd6..f2d7c115 100644 --- a/game/editor-wasm/Cargo.toml +++ b/game/editor-wasm/Cargo.toml @@ -21,8 +21,8 @@ wasm-runtime = { path = "../../lib/wasm-runtime" } editor = { path = "../editor", default-features = false } anyhow = { version = "1.0.100", features = ["backtrace"] } -egui = { version = "0.32.3", default-features = false, features = ["serde"] } -libloading = "0.8.9" +egui = { version = "0.33.0", default-features = false, features = ["serde"] } +libloading = "0.9.0" rayon = "1.11.0" tracing = { version = "0.1.41", default-features = false, features = [ "attributes", diff --git a/game/editor/Cargo.toml b/game/editor/Cargo.toml index ed8d6a2c..ee32ebbe 100644 --- a/game/editor/Cargo.toml +++ b/game/editor/Cargo.toml @@ -35,10 +35,10 @@ map = { path = "../map" } map-convert-lib = { path = "../map-convert-lib" } -egui = { version = "0.32.3", default-features = false, features = ["serde"] } -egui-file-dialog = { version = "0.11.0", default-features = false } -egui_commonmark = "0.21.1" -egui_extras = { version = "0.32.3" } +egui = { version = "0.33.0", default-features = false, features = ["serde"] } +egui-file-dialog = { version = "0.12.0", default-features = false } +egui_commonmark = "0.22.0" +egui_extras = { version = "0.33.0" } anyhow = { version = "1.0.100", features = ["backtrace"] } async-trait = "0.1.89" diff --git a/game/editor/src/ui/assets_store_panel/panel.rs b/game/editor/src/ui/assets_store_panel/panel.rs index d9c705ae..bc1ff506 100644 --- a/game/editor/src/ui/assets_store_panel/panel.rs +++ b/game/editor/src/ui/assets_store_panel/panel.rs @@ -257,7 +257,7 @@ pub fn render(ui: &mut egui::Ui, pipe: &mut UiRenderPipe, ui_st &img.tex, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(ui.clip_rect()), pos, vec2::new(width * scale, height * scale), diff --git a/game/editor/src/ui/auto_mapper/auto_mapper.rs b/game/editor/src/ui/auto_mapper/auto_mapper.rs index d5710d8c..26a83d9c 100644 --- a/game/editor/src/ui/auto_mapper/auto_mapper.rs +++ b/game/editor/src/ui/auto_mapper/auto_mapper.rs @@ -75,7 +75,7 @@ fn render_tile_picker( tile_texture, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(ui.clip_rect()), vec2::new(pos_min.x, pos_min.y) + vec2::new(tile_size, tile_size) / 2.0, vec2::new(tile_size, tile_size), @@ -228,7 +228,7 @@ fn render_grid( tile_texture, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(ui.clip_rect()), vec2::new(pos_min.x, pos_min.y) + vec2::new(tile_size, tile_size) / 2.0, vec2::new(tile_size, tile_size), @@ -341,7 +341,7 @@ fn render_op_list( &rule_textures.tile_textures_pngs[tile_index as usize], ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), Some(ui.clip_rect()), vec2::new(pos_min.x, pos_min.y) + vec2::new(ROW_HEIGHT, ROW_HEIGHT) / 2.0, vec2::new(ROW_HEIGHT, ROW_HEIGHT), @@ -462,7 +462,7 @@ pub fn render(pipe: &mut UiRenderPipe, ui: &mut egui::Ui, ui_state: &m auto_mapper.file_dialog.pick_file(); auto_mapper.file_dialog_ty = FileDialogTy::LoadResource; } - if auto_mapper.file_dialog.state() == DialogState::Open { + if *auto_mapper.file_dialog.state() == DialogState::Open { let mode = auto_mapper.file_dialog.mode(); if let Some(selected) = auto_mapper .file_dialog diff --git a/game/editor/src/ui/bottom_panel/panel.rs b/game/editor/src/ui/bottom_panel/panel.rs index 91fd5a19..480f6ce5 100644 --- a/game/editor/src/ui/bottom_panel/panel.rs +++ b/game/editor/src/ui/bottom_panel/panel.rs @@ -379,7 +379,7 @@ pub fn render(ui: &mut egui::Ui, pipe: &mut UiRenderPipe, ui_st }; let pos = ui_pos_to_world_pos( pipe.user_data.canvas_handle, - &ui.ctx().screen_rect(), + &ui.ctx().content_rect(), editor_tab.map.groups.user.zoom, vec2::new(cursor_pos.x, cursor_pos.y), editor_tab.map.groups.user.pos.x, diff --git a/game/editor/src/ui/left_panel/groups_and_layers.rs b/game/editor/src/ui/left_panel/groups_and_layers.rs index ff849204..9ee4bf53 100644 --- a/game/editor/src/ui/left_panel/groups_and_layers.rs +++ b/game/editor/src/ui/left_panel/groups_and_layers.rs @@ -120,7 +120,7 @@ fn check_layer_clicked_tile(ui: &mut egui::Ui, pipe: &mut UiRenderPipe( .collect(); let file_dialog = &mut panel_data.file_dialog; - if file_dialog.state() == DialogState::Open { + if *file_dialog.state() == DialogState::Open { let mode = file_dialog.mode(); if let Some(selected) = file_dialog.update(ui.ctx()).picked() { match mode { diff --git a/game/editor/src/ui/main_frame.rs b/game/editor/src/ui/main_frame.rs index 80d2df80..43440140 100644 --- a/game/editor/src/ui/main_frame.rs +++ b/game/editor/src/ui/main_frame.rs @@ -122,12 +122,12 @@ pub fn render(ui: &mut egui::Ui, pipe: &mut UiRenderPipe, ui_state: &m } *pipe.user_data.input_state = Some(ui.ctx().input(|inp| inp.clone())); - *pipe.user_data.canvas_size = Some(ui.ctx().input(|inp| inp.screen_rect())); + *pipe.user_data.canvas_size = Some(ui.ctx().input(|inp| inp.content_rect())); if let Some(hovered_file) = pipe.user_data.hovered_file.as_ref() { Modal::new("hovered-file-drag-zones".into()).show(ui.ctx(), |ui| { - ui.set_width(ui.ctx().screen_rect().width()); - ui.set_height(ui.ctx().screen_rect().height()); + ui.set_width(ui.ctx().content_rect().width()); + ui.set_height(ui.ctx().content_rect().height()); let ext = file_ext_or_twmap_tar(hovered_file).unwrap_or(""); let drop_areas = match ext { @@ -144,12 +144,12 @@ pub fn render(ui: &mut egui::Ui, pipe: &mut UiRenderPipe, ui_state: &m if drop_areas.len() == 1 { draw_dotted_rect( ui, - ui.ctx().screen_rect().expand(-50.0), + ui.ctx().content_rect().expand(-50.0), 10.0, Color32::WHITE, ); ui.painter().text( - ui.ctx().screen_rect().center(), + ui.ctx().content_rect().center(), Align2::CENTER_CENTER, drop_areas[0], FontId::proportional(30.0), @@ -164,14 +164,14 @@ pub fn render(ui: &mut egui::Ui, pipe: &mut UiRenderPipe, ui_state: &m .or(i.pointer.latest_pos()) }) .unwrap_or(*pipe.user_data.current_client_pointer_pos); - let left_active = pointer.x < ui.ctx().screen_rect().width() / 2.0; + let left_active = pointer.x < ui.ctx().content_rect().width() / 2.0; let (left_color, right_color) = if left_active { (Color32::LIGHT_BLUE, Color32::WHITE) } else { (Color32::WHITE, Color32::LIGHT_BLUE) }; - let mut rect = ui.ctx().screen_rect(); + let mut rect = ui.ctx().content_rect(); rect.set_width(rect.width() / 2.0); draw_dotted_rect(ui, rect.expand(-50.0), 10.0, left_color); ui.painter().text( @@ -182,7 +182,7 @@ pub fn render(ui: &mut egui::Ui, pipe: &mut UiRenderPipe, ui_state: &m left_color, ); - let mut rect = ui.ctx().screen_rect(); + let mut rect = ui.ctx().content_rect(); rect = rect.translate((rect.width() / 2.0, 0.0).into()); rect.set_width(rect.width() / 2.0); draw_dotted_rect(ui, rect.expand(-50.0), 10.0, right_color); diff --git a/game/editor/src/ui/mapper_cursors/main_frame.rs b/game/editor/src/ui/mapper_cursors/main_frame.rs index 6d026312..27b651f3 100644 --- a/game/editor/src/ui/mapper_cursors/main_frame.rs +++ b/game/editor/src/ui/mapper_cursors/main_frame.rs @@ -22,7 +22,7 @@ pub fn render( .game_camera() .project(canvas_handle, &mut state, None); - let size = ui.ctx().screen_rect().size(); + let size = ui.ctx().content_rect().size(); let (x0, y0, x1, y1) = state.get_canvas_mapping(); let w = x1 - x0; diff --git a/game/editor/src/ui/tool_overlays/tile_brush.rs b/game/editor/src/ui/tool_overlays/tile_brush.rs index 9adde533..cc1b33f8 100644 --- a/game/editor/src/ui/tool_overlays/tile_brush.rs +++ b/game/editor/src/ui/tool_overlays/tile_brush.rs @@ -63,7 +63,7 @@ pub fn render(ui: &mut egui::Ui, pipe: &mut UiRenderPipe) { let pos = pos(pointer_pos.ui); let cur = TileBrush::pos_on_map( &pipe.user_data.editor_tab.map, - &ui.ctx().screen_rect(), + &ui.ctx().content_rect(), pipe.user_data.canvas_handle, &pos, &offset, diff --git a/game/editor/src/ui/top_menu/menu.rs b/game/editor/src/ui/top_menu/menu.rs index 9033011f..65e131d7 100644 --- a/game/editor/src/ui/top_menu/menu.rs +++ b/game/editor/src/ui/top_menu/menu.rs @@ -334,7 +334,7 @@ pub fn render(ui: &mut egui::Ui, ui_state: &mut UiState, pipe: &mut UiRenderPipe } = menu_dialog_mode { *pipe.user_data.pointer_is_used = true; - if file_dialog.state() == DialogState::Open { + if *file_dialog.state() == DialogState::Open { let mode = file_dialog.mode(); if let Some(selected) = file_dialog.update(ui.ctx()).picked() { let selected: PathBuf = selected.into(); diff --git a/game/editor/src/ui/top_toolbar/toolbar.rs b/game/editor/src/ui/top_toolbar/toolbar.rs index 9058a68e..a449458f 100644 --- a/game/editor/src/ui/top_toolbar/toolbar.rs +++ b/game/editor/src/ui/top_toolbar/toolbar.rs @@ -527,7 +527,7 @@ pub fn render(ui: &mut egui::Ui, pipe: &mut UiRenderPipe, ui_st ui_state.add_blur_rect(res.response.rect, 0.0); - let ui_pos = ui.ctx().screen_rect().center(); + let ui_pos = ui.ctx().content_rect().center(); let tools = &mut pipe.user_data.tools; let res = @@ -595,7 +595,7 @@ pub fn render(ui: &mut egui::Ui, pipe: &mut UiRenderPipe, ui_st { let pos = ui_pos_to_world_pos( pipe.user_data.canvas_handle, - &ui.ctx().screen_rect(), + &ui.ctx().content_rect(), map.groups.user.zoom, vec2::new(ui_pos.x, ui_pos.y), map.groups.user.pos.x, @@ -745,7 +745,7 @@ pub fn render(ui: &mut egui::Ui, pipe: &mut UiRenderPipe, ui_st { let pos = ui_pos_to_world_pos( pipe.user_data.canvas_handle, - &ui.ctx().screen_rect(), + &ui.ctx().content_rect(), map.groups.user.zoom, vec2::new(ui_pos.x, ui_pos.y), map.groups.user.pos.x, diff --git a/game/egui-timeline/Cargo.toml b/game/egui-timeline/Cargo.toml index 8c2e7d34..867ceff5 100644 --- a/game/egui-timeline/Cargo.toml +++ b/game/egui-timeline/Cargo.toml @@ -8,5 +8,5 @@ math = { path = "../../lib/math" } map = { path = "../map" } -egui = { version = "0.32.3", default-features = false, features = ["serde"] } -egui_extras = { version = "0.32.3" } +egui = { version = "0.33.0", default-features = false, features = ["serde"] } +egui_extras = { version = "0.33.0" } diff --git a/game/game-interface/src/types/game.rs b/game/game-interface/src/types/game.rs index 614993f2..ad5a9029 100644 --- a/game/game-interface/src/types/game.rs +++ b/game/game-interface/src/types/game.rs @@ -130,8 +130,9 @@ impl DerefMut for GameTickCooldownAndLength { /// An extension to [GameTickCooldown] that additionally to /// tracking a cooldown also counts how many ticks passed /// since the last cooldown was __activated/created__. -#[derive(Debug, Hiarc, Serialize, Deserialize, Copy, Clone)] +#[derive(Debug, Default, Hiarc, Serialize, Deserialize, Copy, Clone)] pub enum GameTickCooldownAndLastActionCounter { + #[default] None, Cooldown { ticks_left: NonZeroGameTickType, @@ -144,12 +145,6 @@ pub enum GameTickCooldownAndLastActionCounter { }, } -impl Default for GameTickCooldownAndLastActionCounter { - fn default() -> Self { - Self::None - } -} - #[derive(Debug, Hiarc)] pub enum GameTickCooldownAndLastActionCounterTickRes { None, diff --git a/game/legacy-proxy/src/lib.rs b/game/legacy-proxy/src/lib.rs index 2724fb69..c880e606 100644 --- a/game/legacy-proxy/src/lib.rs +++ b/game/legacy-proxy/src/lib.rs @@ -89,7 +89,7 @@ use libtw2_gamenet_ddnet::{ snap_obj::{ self, CHARACTERFLAG_WEAPON_GRENADE, CHARACTERFLAG_WEAPON_GUN, CHARACTERFLAG_WEAPON_HAMMER, CHARACTERFLAG_WEAPON_LASER, CHARACTERFLAG_WEAPON_SHOTGUN, Character, DdnetCharacter, - DdnetPlayer, obj_size, + DdnetPlayer, PROJECTILEFLAG_NORMALIZE_VEL, obj_size, }, }; use libtw2_net::net::PeerId; @@ -1723,19 +1723,16 @@ impl Client { SnapObj::DdnetProjectile(projectile) => { let vel = if projectile.owner < 0 { vec2::new( - projectile.vel_x as f32 / 100000.0, - projectile.vel_y as f32 / 100000.0, + projectile.vel_x as f32 / 1000000.0, + projectile.vel_y as f32 / 1000000.0, ) + } else if (projectile.flags & PROJECTILEFLAG_NORMALIZE_VEL) != 0 { + normalize(&vec2::new(projectile.vel_x as f32, projectile.vel_y as f32)) } else { - const PROJECTILEFLAG_NORMALIZE_VEL: i32 = 1 << 4; - if (projectile.flags & PROJECTILEFLAG_NORMALIZE_VEL) != 0 { - normalize(&vec2::new(projectile.vel_x as f32, projectile.vel_y as f32)) - } else { - vec2::new( - projectile.vel_x as f32 / 100.0, - projectile.vel_y as f32 / 100.0, - ) - } + vec2::new( + projectile.vel_x as f32 / 100.0, + projectile.vel_y as f32 / 100.0, + ) }; add_proj( snapshot, diff --git a/game/map/Cargo.toml b/game/map/Cargo.toml index 0c0aa9c2..9c69d57c 100644 --- a/game/map/Cargo.toml +++ b/game/map/Cargo.toml @@ -39,7 +39,7 @@ zstd = { version = "0.13", default-features = false, features = [ "zdict_builder", ] } -ruzstd = { version = "0.8.1", optional = true } +ruzstd = { version = "0.8.2", optional = true } [dev-dependencies] base-fs = { path = "../../lib/base-fs" } diff --git a/game/prediction-timer/src/prediction_timing.rs b/game/prediction-timer/src/prediction_timing.rs index ab573b15..08c47afb 100644 --- a/game/prediction-timer/src/prediction_timing.rs +++ b/game/prediction-timer/src/prediction_timing.rs @@ -496,14 +496,18 @@ impl PredictionTimer { let fps = 1.0 / frame_time; - // 500 ms, basically ratio a lag compansates per call + // 500 ms, basically ratio a lag compansates per call. + // Smaller values mean the lag is only considered handled + // when adjustment to the prediction reaches that threshold. const HUNDERED_PERCENT_PER_S: f64 = 0.5; + // This ratio is applied to slow adjument down at a constant rate + const ADJUSTMENT_RATIO: f64 = 0.7; // basically the minimum fps we support const HUNDERED_PERCENT_PER_FPS: f64 = 50.0; let perc_adjust = self.timing.smooth_adjustment_time.abs() / HUNDERED_PERCENT_PER_S; let perc_fps_adjust = HUNDERED_PERCENT_PER_FPS / fps; - let perc = (perc_adjust * perc_fps_adjust).clamp(0.0, 1.0); + let perc = (perc_adjust * perc_fps_adjust * ADJUSTMENT_RATIO).clamp(0.0, 1.0); let adjust = self.timing.smooth_adjustment_time * perc; self.timing.smooth_adjustment_time *= 1.0 - perc; @@ -713,8 +717,8 @@ mod test { (Duration::from_secs(1).as_nanos() / snaps_per_sec as u128) as u64, )) .as_secs_f64(); - // one way from server to client (so only half rtt) + // one way from server to client (so only half rtt) let time_snap = snap.0; let time_client = time_snap.as_secs_f64() - time.as_secs_f64(); let time_server = snap.1 as f64 * 1.0 / snaps_per_sec as f64; diff --git a/lib/api-macros/Cargo.toml b/lib/api-macros/Cargo.toml index 26b6a2d6..8250fea0 100644 --- a/lib/api-macros/Cargo.toml +++ b/lib/api-macros/Cargo.toml @@ -9,4 +9,4 @@ proc-macro = true [dependencies] proc-macro2 = "1.0.103" quote = "1.0.41" -syn = { version = "2.0.108", features = ["full", "extra-traits"] } +syn = { version = "2.0.109", features = ["full", "extra-traits"] } diff --git a/lib/api-ui/Cargo.toml b/lib/api-ui/Cargo.toml index 9ae574f0..407899eb 100644 --- a/lib/api-ui/Cargo.toml +++ b/lib/api-ui/Cargo.toml @@ -9,5 +9,5 @@ graphics-types = { path = "../../lib/graphics-types" } ui-base = { path = "../../lib/ui-base" } ui-generic = { path = "../../lib/ui-generic" } -egui = { version = "0.32.3", default-features = false, features = ["serde"] } +egui = { version = "0.33.0", default-features = false, features = ["serde"] } once_cell = "1.21.3" diff --git a/lib/api-wasm-macros/Cargo.toml b/lib/api-wasm-macros/Cargo.toml index f71ee85b..cba3e80f 100644 --- a/lib/api-wasm-macros/Cargo.toml +++ b/lib/api-wasm-macros/Cargo.toml @@ -9,4 +9,4 @@ proc-macro = true [dependencies] proc-macro2 = "1.0.103" quote = "1.0.41" -syn = { version = "2.0.108", features = ["full"] } +syn = { version = "2.0.109", features = ["full"] } diff --git a/lib/auto-updater/Cargo.toml b/lib/auto-updater/Cargo.toml index f3c3b18b..d32aea98 100644 --- a/lib/auto-updater/Cargo.toml +++ b/lib/auto-updater/Cargo.toml @@ -20,4 +20,4 @@ serde_json = "1.0.145" tempfile = "3.23.0" tokio = { version = "1.48.0", default-features = false, features = ["time"] } url = "2.5.7" -zip = { version = "5.1.1", default-features = false, features = ["deflate"] } +zip = { version = "6.0.0", default-features = false, features = ["deflate"] } diff --git a/lib/config-macro/Cargo.toml b/lib/config-macro/Cargo.toml index c4caf3e1..218f6937 100644 --- a/lib/config-macro/Cargo.toml +++ b/lib/config-macro/Cargo.toml @@ -9,4 +9,4 @@ proc-macro = true [dependencies] proc-macro2 = "1.0.103" quote = "1.0.41" -syn = { version = "2.0.108", features = ["full"] } +syn = { version = "2.0.109", features = ["full"] } diff --git a/lib/game-database-macros/Cargo.toml b/lib/game-database-macros/Cargo.toml index 43ef5c2c..963150dd 100644 --- a/lib/game-database-macros/Cargo.toml +++ b/lib/game-database-macros/Cargo.toml @@ -9,4 +9,4 @@ proc-macro = true [dependencies] proc-macro2 = "1.0.103" quote = "1.0.41" -syn = { version = "2.0.108", features = ["full"] } +syn = { version = "2.0.109", features = ["full"] } diff --git a/lib/graphics-backend/Cargo.toml b/lib/graphics-backend/Cargo.toml index fbff0526..5b65b08d 100644 --- a/lib/graphics-backend/Cargo.toml +++ b/lib/graphics-backend/Cargo.toml @@ -40,8 +40,8 @@ either = "1.15.0" futures = "0.3.31" libc = "0.2.177" log = "0.4.28" -naga = { version = "26.0.0", features = ["wgsl-in", "spv-out", "glsl-out"] } -naga_oil = "0.19.1" +naga = { version = "27.0.3", features = ["wgsl-in", "spv-out", "glsl-out"] } +naga_oil = "0.20.0" num-derive = "0.4.2" num-traits = "0.2.19" parking_lot = "0.12.5" diff --git a/lib/hiarc-macro/Cargo.toml b/lib/hiarc-macro/Cargo.toml index 14a09204..7a5014bc 100644 --- a/lib/hiarc-macro/Cargo.toml +++ b/lib/hiarc-macro/Cargo.toml @@ -9,7 +9,7 @@ proc-macro = true [dependencies] proc-macro2 = "1.0.103" quote = "1.0.41" -syn = { version = "2.0.108", features = ["full", "extra-traits"] } +syn = { version = "2.0.109", features = ["full", "extra-traits"] } [dev-dependencies] hiarc = { path = "../hiarc" } diff --git a/lib/hiarc/Cargo.toml b/lib/hiarc/Cargo.toml index 578f15bc..743fdd10 100644 --- a/lib/hiarc/Cargo.toml +++ b/lib/hiarc/Cargo.toml @@ -40,7 +40,7 @@ ascii = { version = "1.1.0", default-features = false, optional = true } ash = { version = "0.38.0", default-features = false, optional = true } chrono = { version = "0.4.42", default-features = false, optional = true } crossbeam = { version = "0.8.4", default-features = false, optional = true } -egui = { version = "0.32.3", default-features = false, optional = true } +egui = { version = "0.33.0", default-features = false, optional = true } either = { version = "1.15.0", default-features = false, optional = true } fixed = { version = "1.29.0", default-features = false, optional = true } hashlink = { git = "https://github.com/Jupeyy/hashlink/", branch = "ddnet", default-features = false, features = [ diff --git a/lib/network/Cargo.toml b/lib/network/Cargo.toml index 6928a7f2..7163be0e 100644 --- a/lib/network/Cargo.toml +++ b/lib/network/Cargo.toml @@ -44,7 +44,7 @@ tokio = { version = "1.48.0", features = [ "time", "macros", ] } -tokio-tungstenite = { version = "0.27.0", features = [ +tokio-tungstenite = { version = "0.28.0", features = [ "tokio-rustls", "rustls-tls-webpki-roots", ] } diff --git a/lib/ui-base/Cargo.toml b/lib/ui-base/Cargo.toml index 3fda0557..1766e274 100644 --- a/lib/ui-base/Cargo.toml +++ b/lib/ui-base/Cargo.toml @@ -11,8 +11,8 @@ hiarc = { path = "../hiarc", features = ["enable_egui"] } math = { path = "../math" } anyhow = { version = "1.0.100", features = ["backtrace"] } -egui = { version = "0.32.3", default-features = false, features = ["serde"] } -egui_extras = { version = "0.32.3" } +egui = { version = "0.33.0", default-features = false, features = ["serde"] } +egui_extras = { version = "0.33.0" } serde = { version = "1.0.228", features = ["derive"] } tracing = { version = "0.1.41", default-features = false, features = [ "attributes", diff --git a/lib/ui-generic/Cargo.toml b/lib/ui-generic/Cargo.toml index 3d87f023..bb352d0a 100644 --- a/lib/ui-generic/Cargo.toml +++ b/lib/ui-generic/Cargo.toml @@ -8,7 +8,7 @@ graphics = { path = "../graphics" } math = { path = "../math" } ui-base = { path = "../ui-base" } -egui = { version = "0.32.3", default-features = false, features = ["serde"] } +egui = { version = "0.33.0", default-features = false, features = ["serde"] } tracing = { version = "0.1.41", default-features = false, features = [ "attributes", ] } diff --git a/lib/ui-wasm-manager/Cargo.toml b/lib/ui-wasm-manager/Cargo.toml index c770a2d3..0b3b86a1 100644 --- a/lib/ui-wasm-manager/Cargo.toml +++ b/lib/ui-wasm-manager/Cargo.toml @@ -21,7 +21,7 @@ wasm-logic-sound = { path = "../wasm-logic-sound" } wasm-runtime = { path = "../wasm-runtime" } anyhow = { version = "1.0.100", features = ["backtrace"] } -egui = { version = "0.32.3", default-features = false, features = ["serde"] } +egui = { version = "0.33.0", default-features = false, features = ["serde"] } serde = "1.0.228" tracing = { version = "0.1.41", default-features = false, features = [ "attributes", diff --git a/src/assets-server/Cargo.toml b/src/assets-server/Cargo.toml index 81280d4b..2f87683e 100644 --- a/src/assets-server/Cargo.toml +++ b/src/assets-server/Cargo.toml @@ -20,7 +20,7 @@ tokio = { version = "1.48.0", features = [ "macros", ] } -clap = { version = "4.5.50", features = ["derive"] } +clap = { version = "4.5.51", features = ["derive"] } dotenvy = "0.15.7" env_logger = "0.11.8" log = "0.4.28" diff --git a/src/client/client.rs b/src/client/client.rs index 1daab562..ab5f2f4b 100644 --- a/src/client/client.rs +++ b/src/client/client.rs @@ -2074,7 +2074,7 @@ impl ClientNativeImpl { render_tee, ui, ui_state, - ui.ctx().screen_rect(), + ui.ctx().content_rect(), None, char.info.skin.borrow(), Some(&char.info.skin_info), diff --git a/src/client/overlays/client_stats.rs b/src/client/overlays/client_stats.rs index ee8f4b4c..15a36d05 100644 --- a/src/client/overlays/client_stats.rs +++ b/src/client/overlays/client_stats.rs @@ -240,11 +240,11 @@ impl ClientStatsData { let (pos, anchor) = if bottom { ( - ui.ctx().screen_rect().right_bottom(), + ui.ctx().content_rect().right_bottom(), egui::Align2::RIGHT_BOTTOM, ) } else { - (ui.ctx().screen_rect().right_top(), egui::Align2::RIGHT_TOP) + (ui.ctx().content_rect().right_top(), egui::Align2::RIGHT_TOP) }; ui.painter().text( @@ -311,7 +311,7 @@ impl ClientStats { pub fn render_connection_issues(ui: &mut egui::Ui) { ui.painter().text( - ui.ctx().screen_rect().center(), + ui.ctx().content_rect().center(), egui::Align2::CENTER_CENTER, "\u{f071} Connection to the server unstable or lost.", FontId::proportional(25.0), @@ -322,12 +322,12 @@ impl ClientStats { fn render_mic(ui: &mut egui::Ui, bottom: bool) { let (pos, anchor) = if bottom { ( - ui.ctx().screen_rect().right_bottom() - egui::vec2(-5.0, 20.0), + ui.ctx().content_rect().right_bottom() - egui::vec2(-5.0, 20.0), egui::Align2::RIGHT_BOTTOM, ) } else { ( - ui.ctx().screen_rect().right_top() + egui::vec2(-5.0, 20.0), + ui.ctx().content_rect().right_top() + egui::vec2(-5.0, 20.0), egui::Align2::RIGHT_TOP, ) }; diff --git a/src/community-register-server/Cargo.toml b/src/community-register-server/Cargo.toml index 38adc258..80a80918 100644 --- a/src/community-register-server/Cargo.toml +++ b/src/community-register-server/Cargo.toml @@ -8,7 +8,7 @@ community = { path = "../../game/community" } anyhow = { version = "1.0.100", features = ["backtrace"] } axum = "0.8.6" -clap = { version = "4.5.50", features = ["derive"] } +clap = { version = "4.5.51", features = ["derive"] } tokio = { version = "1.48.0", features = [ "rt-multi-thread", "sync", diff --git a/src/community-server/Cargo.toml b/src/community-server/Cargo.toml index 11a3ed14..3aa0f6cb 100644 --- a/src/community-server/Cargo.toml +++ b/src/community-server/Cargo.toml @@ -18,7 +18,7 @@ sql = { path = "../../lib/sql", default-features = false, features = ["mysql"] } anyhow = { version = "1.0.100", features = ["backtrace"] } async-trait = "0.1.89" -clap = { version = "4.5.50", features = ["derive"] } +clap = { version = "4.5.51", features = ["derive"] } log = "0.4.28" reqwest = { version = "0.12.24", default-features = false, features = [ "rustls-tls", diff --git a/src/dilate/Cargo.toml b/src/dilate/Cargo.toml index 811b34d3..0e670946 100644 --- a/src/dilate/Cargo.toml +++ b/src/dilate/Cargo.toml @@ -6,7 +6,7 @@ edition = "2024" [dependencies] image-utils = { path = "../../lib/image-utils" } -clap = { version = "4.5.50", features = ["derive"] } +clap = { version = "4.5.51", features = ["derive"] } oxipng = { version = "9.1", features = ["parallel"], default-features = false } rayon = "1.11.0" tokio = { version = "1.48.0", features = [ diff --git a/src/editor-server/Cargo.toml b/src/editor-server/Cargo.toml index 67a5d41d..8e80346c 100644 --- a/src/editor-server/Cargo.toml +++ b/src/editor-server/Cargo.toml @@ -21,7 +21,7 @@ editor = { path = "../../game/editor" } anyhow = { version = "1.0.100", features = ["backtrace"] } chrono = { version = "0.4.42" } -clap = { version = "4.5.50", features = ["derive"] } +clap = { version = "4.5.51", features = ["derive"] } ed25519-dalek = { version = "2.2.0", features = ["serde"] } env_logger = "0.11.8" log = "0.4.28" diff --git a/src/emoticon-convert/Cargo.toml b/src/emoticon-convert/Cargo.toml index ac45c908..a6efefee 100644 --- a/src/emoticon-convert/Cargo.toml +++ b/src/emoticon-convert/Cargo.toml @@ -9,4 +9,4 @@ assets-splitting = { path = "../../game/assets-splitting" } image-utils = { path = "../../lib/image-utils" } -clap = { version = "4.5.50", features = ["derive"] } +clap = { version = "4.5.51", features = ["derive"] } diff --git a/src/extra-convert/Cargo.toml b/src/extra-convert/Cargo.toml index 8abf1b49..0257058f 100644 --- a/src/extra-convert/Cargo.toml +++ b/src/extra-convert/Cargo.toml @@ -9,4 +9,4 @@ assets-splitting = { path = "../../game/assets-splitting" } image-utils = { path = "../../lib/image-utils" } -clap = { version = "4.5.50", features = ["derive"] } +clap = { version = "4.5.51", features = ["derive"] } diff --git a/src/game-convert/Cargo.toml b/src/game-convert/Cargo.toml index 6eb77f09..ca19b53f 100644 --- a/src/game-convert/Cargo.toml +++ b/src/game-convert/Cargo.toml @@ -9,4 +9,4 @@ assets-splitting = { path = "../../game/assets-splitting" } image-utils = { path = "../../lib/image-utils" } -clap = { version = "4.5.50", features = ["derive"] } +clap = { version = "4.5.51", features = ["derive"] } diff --git a/src/hud-convert/Cargo.toml b/src/hud-convert/Cargo.toml index 2a327d44..f8facaaf 100644 --- a/src/hud-convert/Cargo.toml +++ b/src/hud-convert/Cargo.toml @@ -9,4 +9,4 @@ assets-splitting = { path = "../../game/assets-splitting" } image-utils = { path = "../../lib/image-utils" } -clap = { version = "4.5.50", features = ["derive"] } +clap = { version = "4.5.51", features = ["derive"] } diff --git a/src/map-convert/Cargo.toml b/src/map-convert/Cargo.toml index 931c52e5..288f492c 100644 --- a/src/map-convert/Cargo.toml +++ b/src/map-convert/Cargo.toml @@ -12,7 +12,7 @@ map = { path = "../../game/map" } map-convert-lib = { path = "../../game/map-convert-lib" } anyhow = { version = "1.0.100", features = ["backtrace"] } -clap = { version = "4.5.50", features = ["derive"] } +clap = { version = "4.5.51", features = ["derive"] } env_logger = "0.11.8" log = "0.4.28" rayon = "1.11.0" diff --git a/src/part-convert/Cargo.toml b/src/part-convert/Cargo.toml index fc6cdd51..55c987d7 100644 --- a/src/part-convert/Cargo.toml +++ b/src/part-convert/Cargo.toml @@ -9,4 +9,4 @@ assets-splitting = { path = "../../game/assets-splitting" } image-utils = { path = "../../lib/image-utils" } -clap = { version = "4.5.50", features = ["derive"] } +clap = { version = "4.5.51", features = ["derive"] } diff --git a/src/skin-convert/Cargo.toml b/src/skin-convert/Cargo.toml index af3c8bc6..f2234780 100644 --- a/src/skin-convert/Cargo.toml +++ b/src/skin-convert/Cargo.toml @@ -8,5 +8,5 @@ assets-splitting = { path = "../../game/assets-splitting" } image-utils = { path = "../../lib/image-utils" } -clap = { version = "4.5.50", features = ["derive"] } +clap = { version = "4.5.51", features = ["derive"] } rayon = "1.11.0"