diff --git a/CHANGELOG.md b/CHANGELOG.md index 7341372d8..bf027b3f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,7 +36,7 @@ - Fixed crash when exiting the editor - Fixed opening arbitrary files from asset browser - Ability to open scenes from asset browser -- User-defined data for tabs +- User-defined data for tabs - Ability to add and remove tabs in the `TabControl` widget via messages - Added a nine patch widget - Fixed tab control's content alignment diff --git a/Cargo.toml b/Cargo.toml index 5efb77238..93288f291 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fyrox" -version = "0.30.0" +version = "0.31.0" authors = ["Dmitry Stepanov ", "Fyrox Engine Contributors"] edition = "2021" license = "MIT" @@ -37,11 +37,11 @@ opt-level = 3 debug = true [dependencies] -fyrox-core-derive = { path = "fyrox-core-derive", version = "0.19.0" } -fyrox-core = { path = "fyrox-core", version = "0.24.0", features = ["serde"] } -fyrox-sound = { path = "fyrox-sound", version = "0.31.0" } -fyrox-ui = { path = "fyrox-ui", version = "0.21.0" } -fyrox-resource = { path = "fyrox-resource", version = "0.8.0" } +fyrox-core-derive = { path = "fyrox-core-derive", version = "0.20.0" } +fyrox-core = { path = "fyrox-core", version = "0.25.0", features = ["serde"] } +fyrox-sound = { path = "fyrox-sound", version = "0.32.0" } +fyrox-ui = { path = "fyrox-ui", version = "0.22.0" } +fyrox-resource = { path = "fyrox-resource", version = "0.9.0" } rapier2d = { version = "0.17", features = ["debug-render"] } rapier3d = { version = "0.17", features = ["debug-render"] } image = { version = "0.24.3", default-features = false, features = ["gif", "jpeg", "png", "tga", "tiff", "bmp"] } diff --git a/editor-standalone/Cargo.toml b/editor-standalone/Cargo.toml index d47d14473..390ff53b4 100644 --- a/editor-standalone/Cargo.toml +++ b/editor-standalone/Cargo.toml @@ -13,5 +13,5 @@ readme = "README.md" include = ["/src/**/*", "/Cargo.toml", "/LICENSE", "/README.md"] [dependencies] -fyrox = { version = "0.30.0", path = "../" } -fyroxed_base = { version = "0.17.0", path = "../editor" } \ No newline at end of file +fyrox = { version = "0.31.0", path = "../" } +fyroxed_base = { version = "0.18.0", path = "../editor" } \ No newline at end of file diff --git a/editor/Cargo.toml b/editor/Cargo.toml index e293283e8..b0bd0d254 100644 --- a/editor/Cargo.toml +++ b/editor/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "fyroxed_base" license = "MIT" -version = "0.17.0" +version = "0.18.0" authors = ["Dmitry Stepanov "] edition = "2021" rust-version = "1.56" @@ -13,7 +13,7 @@ readme = "README.md" include = ["/src/**/*", "/Cargo.toml", "/LICENSE", "/README.md", "/resources/**/*"] [dependencies] -fyrox = { version = "0.30.0", path = ".." } +fyrox = { version = "0.31.0", path = ".." } lazy_static = "1.4.0" ron = "0.8.0" serde = "^1.0.0" diff --git a/fyrox-core-derive/Cargo.toml b/fyrox-core-derive/Cargo.toml index 8883aee7d..ac8c11e8e 100644 --- a/fyrox-core-derive/Cargo.toml +++ b/fyrox-core-derive/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fyrox-core-derive" -version = "0.19.0" +version = "0.20.0" authors = ["toyboot4e , Dmitry Stepanov "] edition = "2021" license = "MIT" diff --git a/fyrox-core/Cargo.toml b/fyrox-core/Cargo.toml index 6dd26dd36..3525a36d9 100644 --- a/fyrox-core/Cargo.toml +++ b/fyrox-core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fyrox-core" -version = "0.24.0" +version = "0.25.0" authors = ["Dmitry Stepanov "] edition = "2021" license = "MIT" @@ -16,7 +16,7 @@ resolver = "2" rust-version = "1.56" [dependencies] -fyrox-core-derive = { path = "../fyrox-core-derive", version = "0.19.0" } +fyrox-core-derive = { path = "../fyrox-core-derive", version = "0.20.0" } base64 = "0.21.0" byteorder = "1.4.3" diff --git a/fyrox-resource/Cargo.toml b/fyrox-resource/Cargo.toml index f9c58c136..b7089661d 100644 --- a/fyrox-resource/Cargo.toml +++ b/fyrox-resource/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fyrox-resource" -version = "0.8.0" +version = "0.9.0" authors = ["Dmitry Stepanov "] edition = "2021" license = "MIT" @@ -15,7 +15,7 @@ resolver = "2" rust-version = "1.56" [dependencies] -fyrox-core = { path = "../fyrox-core", version = "0.24.0" } +fyrox-core = { path = "../fyrox-core", version = "0.25.0" } fxhash = "0.2.1" ron = "0.8.0" serde = { version = "1", features = ["derive"] } diff --git a/fyrox-sound/Cargo.toml b/fyrox-sound/Cargo.toml index 61ef55a39..9a1efb13e 100644 --- a/fyrox-sound/Cargo.toml +++ b/fyrox-sound/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fyrox-sound" -version = "0.31.0" +version = "0.32.0" authors = ["Dmitry Stepanov "] edition = "2021" license = "MIT" @@ -16,8 +16,8 @@ resolver = "2" rust-version = "1.56" [dependencies] -fyrox-core = { path = "../fyrox-core", version = "0.24.0" } -fyrox-resource = { path = "../fyrox-resource", version = "0.8.0" } +fyrox-core = { path = "../fyrox-core", version = "0.25.0" } +fyrox-resource = { path = "../fyrox-resource", version = "0.9.0" } lewton = "0.10.2" hrtf = "0.8.0" hound = "3.4.0" diff --git a/fyrox-ui/Cargo.toml b/fyrox-ui/Cargo.toml index 506d4f5bc..3f1267797 100644 --- a/fyrox-ui/Cargo.toml +++ b/fyrox-ui/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fyrox-ui" -version = "0.21.0" +version = "0.22.0" authors = ["Dmitry Stepanov "] edition = "2021" license = "MIT" @@ -16,7 +16,7 @@ resolver = "2" rust-version = "1.56" [dependencies] -fyrox-core = { path = "../fyrox-core", version = "0.24.0", features = ["serde"] } +fyrox-core = { path = "../fyrox-core", version = "0.25.0", features = ["serde"] } lazy_static = "1.4.0" copypasta = "0.8.1" fontdue = "0.7.2" diff --git a/template/Cargo.toml b/template/Cargo.toml index ad0d14576..f013ea598 100644 --- a/template/Cargo.toml +++ b/template/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fyrox-template" -version = "0.7.2" +version = "0.8.0" edition = "2021" authors = ["Dmitry Stepanov "] license = "MIT" diff --git a/template/src/main.rs b/template/src/main.rs index 707905e3a..12f862059 100644 --- a/template/src/main.rs +++ b/template/src/main.rs @@ -51,8 +51,8 @@ enum Commands { // However, it does not seem to work with builds published to crates.io, because when // the template generator is published, it does not have these Cargo.toml's available // and to solve this we just hard code these values and pray for the best. -const CURRENT_ENGINE_VERSION: &str = "0.30.0"; -const CURRENT_EDITOR_VERSION: &str = "0.17.0"; +const CURRENT_ENGINE_VERSION: &str = "0.31.0"; +const CURRENT_EDITOR_VERSION: &str = "0.18.0"; fn write_file, S: AsRef>(path: P, content: S) { let mut file = File::create(path.as_ref()).unwrap(); @@ -674,6 +674,7 @@ fn main() { // Engine -> Editor version mapping. let editor_versions = [ + ("0.31.0".to_string(), "0.18.0".to_string()), ("0.30.0".to_string(), "0.17.0".to_string()), ("0.29.0".to_string(), "0.16.0".to_string()), ("0.28.0".to_string(), "0.15.0".to_string()),