diff --git a/editor-standalone/Cargo.toml b/editor-standalone/Cargo.toml index bb41fcc83..b7dbeb56e 100644 --- a/editor-standalone/Cargo.toml +++ b/editor-standalone/Cargo.toml @@ -4,7 +4,7 @@ version = "2.0.0-rc.1" license = "MIT" authors = ["Dmitry Stepanov "] edition = "2021" -rust-version = "1.87" +rust-version = "1.94" description = "A standalone scene editor for Fyrox game engine" homepage = "https://github.com/FyroxEngine/Fyrox" keywords = ["fyrox", "editor", "rust"] diff --git a/editor/Cargo.toml b/editor/Cargo.toml index fce00646a..9f68926b6 100644 --- a/editor/Cargo.toml +++ b/editor/Cargo.toml @@ -4,7 +4,7 @@ license = "MIT" version = "2.0.0-rc.1" authors = ["Dmitry Stepanov "] edition = "2021" -rust-version = "1.87" +rust-version = "1.94" description = "A scene editor for Fyrox game engine" homepage = "https://github.com/FyroxEngine/Fyrox" keywords = ["fyrox", "editor", "rust"] diff --git a/editor/src/plugins/absm/canvas.rs b/editor/src/plugins/absm/canvas.rs index ee5a4f376..b81651aa6 100644 --- a/editor/src/plugins/absm/canvas.rs +++ b/editor/src/plugins/absm/canvas.rs @@ -554,10 +554,10 @@ impl Control for AbsmCanvas { Vec::new() }; for &child in self.children() { - if ui[child].is_or_has_field::() { - if ui.rect_test(child, rect).next().is_some() { - selection.push(child); - } + if ui[child].is_or_has_field::() + && ui.rect_test(child, rect).next().is_some() + { + selection.push(child); } } self.set_selection(&selection, ui); diff --git a/fyrox-animation/Cargo.toml b/fyrox-animation/Cargo.toml index d86b34850..88868b670 100644 --- a/fyrox-animation/Cargo.toml +++ b/fyrox-animation/Cargo.toml @@ -12,7 +12,7 @@ homepage = "https://fyrox.rs" documentation = "https://docs.rs/fyrox-animation" repository = "https://github.com/FyroxEngine/Fyrox" readme = "README.md" -rust-version = "1.87" +rust-version = "1.94" [dependencies] fyrox-core = { version = "2.0.0-rc.1", path = "../fyrox-core" } diff --git a/fyrox-autotile/Cargo.toml b/fyrox-autotile/Cargo.toml index ecc337d55..153fb3e51 100644 --- a/fyrox-autotile/Cargo.toml +++ b/fyrox-autotile/Cargo.toml @@ -4,7 +4,7 @@ license = "MIT" version = "2.0.0-rc.1" authors = ["Dmitry Stepanov ", "Brendan Guild "] edition = "2021" -rust-version = "1.87" +rust-version = "1.94" description = "An autotiler for Fyrox game engine" homepage = "https://github.com/FyroxEngine/Fyrox" keywords = ["tilemap", "autotile", "wave", "function", "collapse"] diff --git a/fyrox-build-tools/Cargo.toml b/fyrox-build-tools/Cargo.toml index 533234c6f..efa85ec51 100644 --- a/fyrox-build-tools/Cargo.toml +++ b/fyrox-build-tools/Cargo.toml @@ -10,7 +10,7 @@ include = ["/src/**/*", "/Cargo.toml", "/LICENSE", "/README.md"] homepage = "https://fyrox.rs" documentation = "https://docs.rs/fyrox-build-tools" repository = "https://github.com/FyroxEngine/Fyrox" -rust-version = "1.87" +rust-version = "1.94" [dependencies] fyrox-core = { path = "../fyrox-core", version = "2.0.0-rc.1" } diff --git a/fyrox-core-derive/Cargo.toml b/fyrox-core-derive/Cargo.toml index f54104ec1..726d82c0a 100644 --- a/fyrox-core-derive/Cargo.toml +++ b/fyrox-core-derive/Cargo.toml @@ -8,7 +8,7 @@ description = "Proc-macro for the Visit trait" repository = "https://github.com/FyroxEngine/Fyrox" include = ["/src/**/*", "/Cargo.toml", "/README.md"] readme = "README.md" -rust-version = "1.87" +rust-version = "1.94" [lib] proc-macro = true diff --git a/fyrox-core/Cargo.toml b/fyrox-core/Cargo.toml index 51b1f90e0..97809b93e 100644 --- a/fyrox-core/Cargo.toml +++ b/fyrox-core/Cargo.toml @@ -12,7 +12,7 @@ homepage = "https://fyrox.rs" documentation = "https://docs.rs/fyrox-core" repository = "https://github.com/FyroxEngine/Fyrox" readme = "README.md" -rust-version = "1.87" +rust-version = "1.94" [dependencies] fyrox-core-derive = { path = "../fyrox-core-derive", version = "2.0.0-rc.1" } diff --git a/fyrox-dylib/Cargo.toml b/fyrox-dylib/Cargo.toml index 6e66c80d8..367e775ce 100644 --- a/fyrox-dylib/Cargo.toml +++ b/fyrox-dylib/Cargo.toml @@ -12,7 +12,7 @@ homepage = "https://fyrox.rs" documentation = "https://docs.rs/fyrox-dylib" repository = "https://github.com/FyroxEngine/Fyrox" readme = "README.md" -rust-version = "1.87" +rust-version = "1.94" [lib] crate-type = ["dylib"] diff --git a/fyrox-graph/Cargo.toml b/fyrox-graph/Cargo.toml index 5cbfaf735..7ee6ff6c2 100644 --- a/fyrox-graph/Cargo.toml +++ b/fyrox-graph/Cargo.toml @@ -11,7 +11,7 @@ include = ["/src/**/*", "/Cargo.toml", "/LICENSE"] homepage = "https://fyrox.rs" documentation = "https://docs.rs/fyrox-graph" repository = "https://github.com/FyroxEngine/Fyrox" -rust-version = "1.87" +rust-version = "1.94" [dependencies] fyrox-core = { path = "../fyrox-core", version = "2.0.0-rc.1" } diff --git a/fyrox-graphics-gl/Cargo.toml b/fyrox-graphics-gl/Cargo.toml index ec7782e01..c12cec7e6 100644 --- a/fyrox-graphics-gl/Cargo.toml +++ b/fyrox-graphics-gl/Cargo.toml @@ -10,7 +10,7 @@ include = ["/src/**/*", "/Cargo.toml", "/LICENSE", "/README.md"] homepage = "https://fyrox.rs" documentation = "https://docs.rs/fyrox-graphics-gl" repository = "https://github.com/FyroxEngine/Fyrox" -rust-version = "1.87" +rust-version = "1.94" [dependencies] winit = { version = "0.30", features = ["serde"] } diff --git a/fyrox-graphics/Cargo.toml b/fyrox-graphics/Cargo.toml index b2ea1295b..4fb011e91 100644 --- a/fyrox-graphics/Cargo.toml +++ b/fyrox-graphics/Cargo.toml @@ -10,7 +10,7 @@ include = ["/src/**/*", "/Cargo.toml", "/LICENSE", "/README.md"] homepage = "https://fyrox.rs" documentation = "https://docs.rs/fyrox-graphics" repository = "https://github.com/FyroxEngine/Fyrox" -rust-version = "1.87" +rust-version = "1.94" [dependencies] fyrox-core = { path = "../fyrox-core", version = "2.0.0-rc.1", features = ["serde"] } diff --git a/fyrox-impl/Cargo.toml b/fyrox-impl/Cargo.toml index 034de50be..32bf75b71 100644 --- a/fyrox-impl/Cargo.toml +++ b/fyrox-impl/Cargo.toml @@ -12,7 +12,7 @@ homepage = "https://fyrox.rs" documentation = "https://docs.rs/fyrox" repository = "https://github.com/FyroxEngine/Fyrox" readme = "README.md" -rust-version = "1.87" +rust-version = "1.94" [dependencies] fyrox-core-derive = { path = "../fyrox-core-derive", version = "2.0.0-rc.1" } diff --git a/fyrox-material/Cargo.toml b/fyrox-material/Cargo.toml index cf02b4c98..7067c9551 100644 --- a/fyrox-material/Cargo.toml +++ b/fyrox-material/Cargo.toml @@ -11,7 +11,7 @@ include = ["/src/**/*", "/Cargo.toml", "/LICENSE", "/README.md"] homepage = "https://fyrox.rs" documentation = "https://docs.rs/fyrox-material" repository = "https://github.com/FyroxEngine/Fyrox" -rust-version = "1.87" +rust-version = "1.94" [dependencies] fyrox-core = { version = "2.0.0-rc.1", path = "../fyrox-core" } diff --git a/fyrox-math/Cargo.toml b/fyrox-math/Cargo.toml index 8fe5d12e7..207d10ad9 100644 --- a/fyrox-math/Cargo.toml +++ b/fyrox-math/Cargo.toml @@ -11,7 +11,7 @@ include = ["/src/**/*", "/Cargo.toml", "/LICENSE"] homepage = "https://fyrox.rs" documentation = "https://docs.rs/fyrox-math" repository = "https://github.com/FyroxEngine/Fyrox" -rust-version = "1.87" +rust-version = "1.94" [dependencies] rectutils = "0.7.0" diff --git a/fyrox-resource/Cargo.toml b/fyrox-resource/Cargo.toml index 57a6d3054..1cca1675c 100644 --- a/fyrox-resource/Cargo.toml +++ b/fyrox-resource/Cargo.toml @@ -11,7 +11,7 @@ include = ["/src/**/*", "/Cargo.toml", "/LICENSE"] homepage = "https://fyrox.rs" documentation = "https://docs.rs/fyrox-resource" repository = "https://github.com/FyroxEngine/Fyrox" -rust-version = "1.87" +rust-version = "1.94" [dependencies] fyrox-core = { path = "../fyrox-core", version = "2.0.0-rc.1", features = ["serde"] } diff --git a/fyrox-scripts/Cargo.toml b/fyrox-scripts/Cargo.toml index 2d6090fd0..788183ec0 100644 --- a/fyrox-scripts/Cargo.toml +++ b/fyrox-scripts/Cargo.toml @@ -11,7 +11,7 @@ include = ["/src/**/*", "/Cargo.toml", "/LICENSE"] homepage = "https://fyrox.rs" documentation = "https://docs.rs/fyrox-scripts" repository = "https://github.com/FyroxEngine/Fyrox" -rust-version = "1.87" +rust-version = "1.94" [dependencies] fyrox = { version = "2.0.0-rc.1", path = "../fyrox" } \ No newline at end of file diff --git a/fyrox-sound/Cargo.toml b/fyrox-sound/Cargo.toml index 7dd9a612d..4fb726bbf 100644 --- a/fyrox-sound/Cargo.toml +++ b/fyrox-sound/Cargo.toml @@ -12,7 +12,7 @@ homepage = "https://fyrox.rs" documentation = "https://docs.rs/fyrox-sound" repository = "https://github.com/FyroxEngine/Fyrox" readme = "README.md" -rust-version = "1.87" +rust-version = "1.94" [dependencies] fyrox-core = { path = "../fyrox-core", version = "2.0.0-rc.1" } diff --git a/fyrox-texture/Cargo.toml b/fyrox-texture/Cargo.toml index 9fb5314e0..a00a42633 100644 --- a/fyrox-texture/Cargo.toml +++ b/fyrox-texture/Cargo.toml @@ -10,7 +10,7 @@ include = ["/src/**/*", "/Cargo.toml", "/LICENSE", "/README.md"] homepage = "https://fyrox.rs" documentation = "https://docs.rs/fyrox-texture" repository = "https://github.com/FyroxEngine/Fyrox" -rust-version = "1.87" +rust-version = "1.94" [dependencies] fyrox-core = { path = "../fyrox-core", version = "2.0.0-rc.1" } diff --git a/fyrox-ui/Cargo.toml b/fyrox-ui/Cargo.toml index 53edf0026..f5f49551e 100644 --- a/fyrox-ui/Cargo.toml +++ b/fyrox-ui/Cargo.toml @@ -12,7 +12,7 @@ homepage = "https://fyrox.rs" documentation = "https://docs.rs/fyrox-ui" repository = "https://github.com/FyroxEngine/Fyrox" readme = "README.md" -rust-version = "1.87" +rust-version = "1.94" [dependencies] fyrox-core = { path = "../fyrox-core", version = "2.0.0-rc.1", features = ["serde"] } diff --git a/fyrox/Cargo.toml b/fyrox/Cargo.toml index 13d933db8..884d8f6bf 100644 --- a/fyrox/Cargo.toml +++ b/fyrox/Cargo.toml @@ -12,7 +12,7 @@ homepage = "https://fyrox.rs" documentation = "https://docs.rs/fyrox" repository = "https://github.com/FyroxEngine/Fyrox" readme = "README.md" -rust-version = "1.87" +rust-version = "1.94" [features] default = ["fyrox-impl"] diff --git a/project-manager/Cargo.toml b/project-manager/Cargo.toml index 683d98078..afb71e925 100644 --- a/project-manager/Cargo.toml +++ b/project-manager/Cargo.toml @@ -10,7 +10,7 @@ categories = ["game-development"] include = ["/src/**/*", "/Cargo.toml", "/LICENSE", "/README.md", "/resources/**/*", "/pm.version"] homepage = "https://fyrox.rs" repository = "https://github.com/FyroxEngine/Fyrox" -rust-version = "1.87" +rust-version = "1.94" [dependencies] fyrox = { version = "2.0.0-rc.1", path = "../fyrox" } diff --git a/template-core/Cargo.toml b/template-core/Cargo.toml index 344941f8b..8339be642 100644 --- a/template-core/Cargo.toml +++ b/template-core/Cargo.toml @@ -11,7 +11,7 @@ include = ["/src/**/*", "/Cargo.toml", "/LICENSE", "/README.md", "engine.version homepage = "https://fyrox.rs" repository = "https://github.com/FyroxEngine/Fyrox" readme = "README.md" -rust-version = "1.87" +rust-version = "1.94" [dependencies] uuid = { version = "1", features = ["v4"] } diff --git a/template/Cargo.toml b/template/Cargo.toml index 4ee9373d9..849169beb 100644 --- a/template/Cargo.toml +++ b/template/Cargo.toml @@ -11,7 +11,7 @@ include = ["/src/**/*", "/Cargo.toml", "/LICENSE", "/README.md"] homepage = "https://fyrox.rs" repository = "https://github.com/FyroxEngine/Fyrox" readme = "README.md" -rust-version = "1.87" +rust-version = "1.94" [dependencies] fyrox-template-core = { version = "2.0.0-rc.1", path = "../template-core" }