Skip to content
This repository has been archived by the owner on Apr 18, 2022. It is now read-only.

Commit

Permalink
Merge #2188
Browse files Browse the repository at this point in the history 
2188: Meta/2187/release 0 15 0 r=azriel91 a=azriel91

Source finalizations for release (#2187).

Co-authored-by: Azriel Hoh <azriel91@gmail.com>
  • Loading branch information
@bors @azriel91
bors[bot] and azriel91 committed Mar 24, 2020
2 parents b72e532 + 4ebbeb3 commit 6453a83
Show file tree
Hide file tree
Showing 26 changed files with 213 additions and 128 deletions.
36 changes: 18 additions & 18 deletions Cargo.toml
View file
@@ -1,6 +1,6 @@
[package]
name = "amethyst"
version = "0.14.0"
version = "0.15.0"
authors = ["Eyal Kalderon <ebkalderon@gmail.com>", "Amethyst Foundation <contact@amethyst.rs>"]
edition = "2018"
description = "Data-oriented game engine written in Rust"
Expand Down Expand Up @@ -112,23 +112,23 @@ members = [
]

[dependencies]
amethyst_animation = { path = "amethyst_animation", version = "0.9.0", optional = true }
amethyst_assets = { path = "amethyst_assets", version = "0.10.0" }
amethyst_audio = { path = "amethyst_audio", version = "0.9.0", optional = true }
amethyst_config = { path = "amethyst_config", version = "0.13.0" }
amethyst_core = { path = "amethyst_core", version = "0.9.0" }
amethyst_error = { path = "amethyst_error", version = "0.4.0" }
amethyst_controls = { path = "amethyst_controls", version = "0.8.0" }
amethyst_derive = { path = "amethyst_derive", version = "0.7.0" }
amethyst_gltf = { path = "amethyst_gltf", version = "0.9.0", optional = true }
amethyst_network = { path = "amethyst_network", version = "0.7.0", optional = true }
amethyst_locale = { path = "amethyst_locale", version = "0.8.0", optional = true }
amethyst_rendy = { path = "amethyst_rendy", version = "0.4.0", features = ["window"], optional = true }
amethyst_input = { path = "amethyst_input", version = "0.10.0" }
amethyst_ui = { path = "amethyst_ui", version = "0.9.0" }
amethyst_utils = { path = "amethyst_utils", version = "0.9.0" }
amethyst_window = { path = "amethyst_window", version = "0.4.0" }
amethyst_tiles = { path = "amethyst_tiles", version = "0.2.0", optional = true }
amethyst_animation = { path = "amethyst_animation", version = "0.10.0", optional = true }
amethyst_assets = { path = "amethyst_assets", version = "0.11.0" }
amethyst_audio = { path = "amethyst_audio", version = "0.10.0", optional = true }
amethyst_config = { path = "amethyst_config", version = "0.14.0" }
amethyst_core = { path = "amethyst_core", version = "0.10.0" }
amethyst_error = { path = "amethyst_error", version = "0.5.0" }
amethyst_controls = { path = "amethyst_controls", version = "0.9.0" }
amethyst_derive = { path = "amethyst_derive", version = "0.8.0" }
amethyst_gltf = { path = "amethyst_gltf", version = "0.10.0", optional = true }
amethyst_network = { path = "amethyst_network", version = "0.8.0", optional = true }
amethyst_locale = { path = "amethyst_locale", version = "0.9.0", optional = true }
amethyst_rendy = { path = "amethyst_rendy", version = "0.5.0", features = ["window"], optional = true }
amethyst_input = { path = "amethyst_input", version = "0.11.0" }
amethyst_ui = { path = "amethyst_ui", version = "0.10.0" }
amethyst_utils = { path = "amethyst_utils", version = "0.10.0" }
amethyst_window = { path = "amethyst_window", version = "0.5.0" }
amethyst_tiles = { path = "amethyst_tiles", version = "0.3.0", optional = true }
crossbeam-channel = "0.4.0"
derivative = "1.0.3"
fern = { version = "0.5.9", features = ["colored"] }
Expand Down
16 changes: 8 additions & 8 deletions README.md
View file
Expand Up @@ -64,12 +64,12 @@ Please visit the [features page][feat] for a list of features Amethyst provides.

## Navigation

* [**Link to the book (0.14)**][bkstable]
* [**Link to the book (0.13)**][bks13]
* [**Link to the book (master)**][bkm]
* [**Link to the examples (0.14)**][exr14]
* [**Link to the examples (0.13)**][exr13]
* [**Link to the book (0.15)**][bkstable]
* [**Link to the book (0.14)**][bks14]
* [**Link to the examples (master)**][exm]
* [**Link to the examples (0.15)**][ex15]
* [**Link to the examples (0.14)**][ex14]

## Usage

Expand All @@ -78,11 +78,11 @@ While the engine can be hard to use at times, we made a lot of [documentation][b
If you don't understand a part of the documentation, please let us know. Join us on Discord or open an issue; we are always happy to help!

[bkstable]: https://book.amethyst.rs/stable/
[bks13]: https://book.amethyst.rs/v0.13.0/
[bks14]: https://book.amethyst.rs/v0.14.0/
[bkm]: https://book.amethyst.rs/master/
[exr14]: https://github.com/amethyst/amethyst/tree/v0.14.0/examples
[exr13]: https://github.com/amethyst/amethyst/tree/v0.13.2/examples
[exm]: https://github.com/amethyst/amethyst/tree/master/examples
[ex15]: https://github.com/amethyst/amethyst/tree/v0.15.0/examples
[ex14]: https://github.com/amethyst/amethyst/tree/v0.14.0/examples

## Getting started

Expand All @@ -100,7 +100,7 @@ To compile any of the examples run:
$ cargo run --example name_of_example
```

All available examples are listed under the [examples][exr11] directory.
All available examples are listed under the [examples][exm] directory.

For a full-blown "Hello World" tutorial check out the [Getting Started][gs] chapter in the book.

Expand Down
18 changes: 11 additions & 7 deletions amethyst_animation/Cargo.toml
View file
@@ -1,6 +1,6 @@
[package]
name = "amethyst_animation"
version = "0.9.0"
version = "0.10.0"
authors = ["Simon Rönnberg <seamonr@gmail.com>", "Amethyst Foundation <contact@amethyst.rs>"]
edition = "2018"
description = "Animation support for Amethyst"
Expand All @@ -17,12 +17,12 @@ license = "MIT/Apache-2.0"
travis-ci = { repository = "amethyst/amethyst" }

[dependencies]
amethyst_assets = { path = "../amethyst_assets/", version = "0.10.0" }
amethyst_core = { path = "../amethyst_core/", version = "0.9.0" }
amethyst_error = { path = "../amethyst_error/", version = "0.4.0" }
amethyst_derive = { path = "../amethyst_derive", version = "0.7.0" }
amethyst_rendy = { path = "../amethyst_rendy", version = "0.4.0" }
amethyst_ui = { path = "../amethyst_ui", version = "0.9.0" }
amethyst_assets = { path = "../amethyst_assets", version = "0.11.0" }
amethyst_core = { path = "../amethyst_core", version = "0.10.0" }
amethyst_error = { path = "../amethyst_error", version = "0.5.0" }
amethyst_derive = { path = "../amethyst_derive", version = "0.8.0" }
amethyst_rendy = { path = "../amethyst_rendy", version = "0.5.0" }
amethyst_ui = { path = "../amethyst_ui", version = "0.10.0" }
derivative = "1.0"
fnv = "1"
itertools = "0.8.0"
Expand All @@ -35,4 +35,8 @@ thread_profiler = { version = "0.3", optional = true }
[dev-dependencies]

[features]
vulkan = ["amethyst_rendy/vulkan", "amethyst_rendy/vulkan-x11"]
metal = ["amethyst_rendy/metal"]
empty = ["amethyst_rendy/empty"]

profiler = [ "thread_profiler/thread_profiler" ]
8 changes: 4 additions & 4 deletions amethyst_assets/Cargo.toml
View file
@@ -1,6 +1,6 @@
[package]
name = "amethyst_assets"
version = "0.10.0"
version = "0.11.0"
authors = ["torkleyy <torkleyy@gmail.com>", "Amethyst Foundation <contact@amethyst.rs>"]
readme = "README.md"
edition = "2018"
Expand All @@ -20,9 +20,9 @@ repository = "https://github.com/amethyst/amethyst"
travis-ci = { repository = "amethyst/amethyst" }

[dependencies]
amethyst_core = { path = "../amethyst_core", version = "0.9.0" }
amethyst_derive = { path = "../amethyst_derive", version = "0.7.0"}
amethyst_error = { path = "../amethyst_error", version = "0.4.0" }
amethyst_core = { path = "../amethyst_core", version = "0.10.0" }
amethyst_derive = { path = "../amethyst_derive", version = "0.8.0" }
amethyst_error = { path = "../amethyst_error", version = "0.5.0" }
crossbeam-queue = "0.1.2"
derivative = "1.0"
derive-new = "0.5"
Expand Down
10 changes: 5 additions & 5 deletions amethyst_audio/Cargo.toml
View file
@@ -1,6 +1,6 @@
[package]
name = "amethyst_audio"
version = "0.9.0"
version = "0.10.0"
authors = ["Xaeroxe <kieseljake@gmail.com>", "Amethyst Foundation <contact@amethyst.rs>"]
edition = "2018"
description = "Audio support for Amethyst"
Expand All @@ -19,9 +19,9 @@ license = "MIT/Apache-2.0"
travis-ci = { repository = "amethyst/amethyst" }

[dependencies]
amethyst_assets = { path = "../amethyst_assets", version = "0.10.0"}
amethyst_core = { path = "../amethyst_core", version = "0.9.0"}
amethyst_error = { path = "../amethyst_error", version = "0.4.0"}
amethyst_assets = { path = "../amethyst_assets", version = "0.11.0" }
amethyst_core = { path = "../amethyst_core", version = "0.10.0" }
amethyst_error = { path = "../amethyst_error", version = "0.5.0" }
cpal = "0.11"
derive-new = "0.5"
log = "0.4.6"
Expand All @@ -31,7 +31,7 @@ smallvec = { version = "1.2", features = ["serde"] }
thread_profiler = { version = "0.3", optional = true }

[dev-dependencies]
amethyst_utils = { path = "../amethyst_utils", version = "0.9.0"}
amethyst_utils = { path = "../amethyst_utils", version = "0.10.0" }

[features]
profiler = [ "thread_profiler/thread_profiler" ]
2 changes: 1 addition & 1 deletion amethyst_config/Cargo.toml
View file
@@ -1,6 +1,6 @@
[package]
name = "amethyst_config"
version = "0.13.0"
version = "0.14.0"
authors = ["Aceeri <conmcclusk@gmail.com>", "Amethyst Foundation <contact@amethyst.rs>"]
edition = "2018"
description = "Loading from .ron files into Rust structures with defaults to prevent hard errors."
Expand Down
12 changes: 6 additions & 6 deletions amethyst_controls/Cargo.toml
View file
@@ -1,6 +1,6 @@
[package]
name = "amethyst_controls"
version = "0.8.0"
version = "0.9.0"
authors = ["Joël Lupien <jojolepro@jojolepro.com>", "Amethyst Foundation <contact@amethyst.rs>"]
edition = "2018"
description = "Amethyst controls"
Expand All @@ -15,11 +15,11 @@ license = "MIT/Apache-2.0"
travis-ci = { repository = "amethyst/amethyst" }

[dependencies]
amethyst_assets = { path = "../amethyst_assets", version = "0.10.0" }
amethyst_core = { path = "../amethyst_core", version = "0.9.0" }
amethyst_derive = { path = "../amethyst_derive", version = "0.7.0" }
amethyst_error = { path = "../amethyst_error", version = "0.4.0" }
amethyst_input = { path = "../amethyst_input", version = "0.10.0" }
amethyst_assets = { path = "../amethyst_assets", version = "0.11.0" }
amethyst_core = { path = "../amethyst_core", version = "0.10.0" }
amethyst_derive = { path = "../amethyst_derive", version = "0.8.0" }
amethyst_error = { path = "../amethyst_error", version = "0.5.0" }
amethyst_input = { path = "../amethyst_input", version = "0.11.0" }
derive-new = "0.5"
serde = { version = "1.0", features = ["derive"] }
winit = { version = "0.19", features = ["serde"] }
Expand Down
6 changes: 3 additions & 3 deletions amethyst_core/Cargo.toml
View file
@@ -1,6 +1,6 @@
[package]
name = "amethyst_core"
version = "0.9.0"
version = "0.10.0"
authors = ["Simon Rönnberg <seamonr@gmail.com>", "Joël Lupien <jojolepro@jojolepro.com>", "Amethyst Foundation <contact@amethyst.rs>"]
edition = "2018"
description = "Amethyst core"
Expand All @@ -19,7 +19,7 @@ nalgebra = { version = "0.19.0", features = ["serde-serialize", "mint"] }
alga = { version = "0.9.2", default-features = false }
alga_derive = "0.9.1"
approx = "0.3.2"
amethyst_error = { path = "../amethyst_error", version = "0.4.0" }
amethyst_error = { path = "../amethyst_error", version = "0.5.0" }
fnv = "1.0.6"
log = "0.4.8"
num-traits = "0.2.11"
Expand All @@ -34,7 +34,7 @@ derivative = "1.0.3"
thread_profiler = { version = "0.3", optional = true }

[dev-dependencies]
amethyst = { path = "..", version = "0.14.0" }
amethyst = { path = "..", version = "0.15.0" }
ron = "0.5.1"

[features]
Expand Down
4 changes: 4 additions & 0 deletions amethyst_core/src/hidden.rs
View file
Expand Up @@ -16,6 +16,10 @@ impl Component for Hidden {
/// is enabled in the [RenderBundle](struct.RenderBundle.html).
#[derive(Clone, Debug)]
pub struct HiddenPropagate {
/// Whether this is inserted automatically by propagation though the `ParentHierarchy`.
///
/// If true, then the `HideHierarchySystem` should manage (insert / remove) the component.
/// If the user inserts it themselves, then the `HideHierarchySystem` should not remove it.
pub(crate) is_propagated: bool,
}

Expand Down
10 changes: 5 additions & 5 deletions amethyst_derive/Cargo.toml
View file
@@ -1,6 +1,6 @@
[package]
name = "amethyst_derive"
version = "0.7.0"
version = "0.8.0"
authors = ["Simon Rönnberg <seamonr@gmail.com>", "Amethyst Foundation <contact@amethyst.rs>"]
edition = "2018"
description = "Amethyst derive"
Expand All @@ -23,10 +23,10 @@ proc_macro_roids = "0.7"
proc-macro-crate = "0.1"

[dev-dependencies]
amethyst_core = { path = "../amethyst_core", version = "0.9.0" }
amethyst_assets = { path = "../amethyst_assets", version = "0.10.0" }
amethyst_error = { path = "../amethyst_error", version = "0.4.0" }
amethyst_test = { path = "../amethyst_test", version = "0.5.0" }
amethyst_core = { path = "../amethyst_core", version = "0.10.0" }
amethyst_assets = { path = "../amethyst_assets", version = "0.11.0" }
amethyst_error = { path = "../amethyst_error", version = "0.5.0" }
amethyst_test = { path = "../amethyst_test", version = "0.6.0" }

[lib]
name = "amethyst_derive"
Expand Down
2 changes: 1 addition & 1 deletion amethyst_error/Cargo.toml
View file
@@ -1,6 +1,6 @@
[package]
name = "amethyst_error"
version = "0.4.0"
version = "0.5.0"
authors = ["John-John Tedro <udoprog@tedro.se>", "Amethyst Foundation <contact@amethyst.rs>"]
readme = "README.md"
edition = "2018"
Expand Down
16 changes: 10 additions & 6 deletions amethyst_gltf/Cargo.toml
View file
@@ -1,6 +1,6 @@
[package]
name = "amethyst_gltf"
version = "0.9.0"
version = "0.10.0"
authors = ["Rhuagh <seamonr@gmail.com>", "Amethyst Foundation <contact@amethyst.rs>"]
edition = "2018"
description = "GLTF asset loading"
Expand All @@ -15,11 +15,11 @@ license = "MIT/Apache-2.0"
travis-ci = { repository = "amethyst/amethyst" }

[dependencies]
amethyst_assets = { path = "../amethyst_assets/", version = "0.10.0" }
amethyst_animation = { path = "../amethyst_animation/", version = "0.9.0" }
amethyst_core = { path = "../amethyst_core/", version = "0.9.0" }
amethyst_error = { path = "../amethyst_error/", version = "0.4.0" }
amethyst_rendy = { path = "../amethyst_rendy", version = "0.4.0" }
amethyst_assets = { path = "../amethyst_assets", version = "0.11.0" }
amethyst_animation = { path = "../amethyst_animation", version = "0.10.0" }
amethyst_core = { path = "../amethyst_core", version = "0.10.0" }
amethyst_error = { path = "../amethyst_error", version = "0.5.0" }
amethyst_rendy = { path = "../amethyst_rendy", version = "0.5.0" }
err-derive = "0.2.3"
base64 = "0.11"
fnv = "1"
Expand All @@ -35,4 +35,8 @@ image = "0.22.2"
derivative = "1.0"

[features]
vulkan = ["amethyst_rendy/vulkan", "amethyst_rendy/vulkan-x11"]
metal = ["amethyst_rendy/metal"]
empty = ["amethyst_rendy/empty"]

profiler = [ "thread_profiler/thread_profiler" ]
10 changes: 5 additions & 5 deletions amethyst_input/Cargo.toml
View file
@@ -1,6 +1,6 @@
[package]
name = "amethyst_input"
version = "0.10.0"
version = "0.11.0"
authors = ["Rhuagh <seamonr@gmail.com>", "Xaeroxe <kieseljake@gmail.com>", "Amethyst Foundation <contact@amethyst.rs>"]
edition = "2018"
description = "Input rebinding "
Expand All @@ -15,10 +15,10 @@ license = "MIT/Apache-2.0"
travis-ci = { repository = "amethyst/amethyst" }

[dependencies]
amethyst_core = { path = "../amethyst_core/", version = "0.9.0" }
amethyst_error = { path = "../amethyst_error/", version = "0.4.0" }
amethyst_config = { path = "../amethyst_config/", version = "0.13.0" }
amethyst_window = { path = "../amethyst_window/", version = "0.4.0" }
amethyst_core = { path = "../amethyst_core", version = "0.10.0" }
amethyst_error = { path = "../amethyst_error", version = "0.5.0" }
amethyst_config = { path = "../amethyst_config/", version = "0.14.0" }
amethyst_window = { path = "../amethyst_window", version = "0.5.0" }
derivative = "1.0"
derive-new = "0.5"
fnv = "1"
Expand Down
8 changes: 4 additions & 4 deletions amethyst_locale/Cargo.toml
View file
@@ -1,6 +1,6 @@
[package]
name = "amethyst_locale"
version = "0.8.0"
version = "0.9.0"
authors = ["Joël Lupien <jojolepro@jojolepro.com>", "Amethyst Foundation <contact@amethyst.rs>"]
readme = "README.md"
edition = "2018"
Expand All @@ -20,9 +20,9 @@ repository = "https://github.com/amethyst/amethyst"
travis-ci = { repository = "amethyst/amethyst" }

[dependencies]
amethyst_assets = { path = "../amethyst_assets", version = "0.10.0" }
amethyst_core = { path = "../amethyst_core", version = "0.9.0" }
amethyst_error = { path = "../amethyst_error", version = "0.4.0" }
amethyst_assets = { path = "../amethyst_assets", version = "0.11.0" }
amethyst_core = { path = "../amethyst_core", version = "0.10.0" }
amethyst_error = { path = "../amethyst_error", version = "0.5.0" }
serde = { version = "1.0", features = ["derive"] }
fluent = "0.11"
unic-langid = { version = "0.8", features = ["macros"] }
Expand Down
3 changes: 1 addition & 2 deletions amethyst_locale/src/lib.rs
View file
Expand Up @@ -13,8 +13,7 @@
use amethyst_assets::{Asset, Format, Handle};
use amethyst_core::ecs::prelude::VecStorage;
use amethyst_error::Error;
pub use fluent::concurrent::FluentBundle;
pub use fluent::FluentResource;
pub use fluent::{concurrent::FluentBundle, FluentResource};
use serde::{Deserialize, Serialize};
use unic_langid::langid;

Expand Down
6 changes: 3 additions & 3 deletions amethyst_network/Cargo.toml
View file
@@ -1,6 +1,6 @@
[package]
name = "amethyst_network"
version = "0.7.0"
version = "0.8.0"
authors = [
"Joël Lupien (Jojolepro) <jojolepro@jojolepro.com>",
"Lucio Franco (LucioFranco) <luciofranco14@gmail.com>",
Expand All @@ -23,8 +23,8 @@ license = "MIT/Apache-2.0"
profiler = [ "thread_profiler/thread_profiler" ]

[dependencies]
amethyst_core = { path = "../amethyst_core", version = "0.9.0" }
amethyst_error = { path = "../amethyst_error", version = "0.4.0" }
amethyst_core = { path = "../amethyst_core", version = "0.10.0" }
amethyst_error = { path = "../amethyst_error", version = "0.5.0" }
bytes = "0.5"
laminar = "0.3"
log = "0.4"
Expand Down

0 comments on commit 6453a83

Please sign in to comment.