Merge branch 'master' into master

amethyst_assets/src/progress.rs

@@ -43,7 +43,7 @@ impl Progress for () {
 
 /// A progress tracker which is passed to the `Loader`
 /// in order to check how many assets are loaded.
-#[derive(Default)]
+#[derive(Default, Debug)]
 pub struct ProgressCounter {
     errors: Arc<Mutex<Vec<AssetErrorMeta>>>,
     num_assets: usize,
@@ -123,7 +123,7 @@ impl<'a> Progress for &'a mut ProgressCounter {
 }
 
 /// Progress tracker for `ProgressCounter`.
-#[derive(Default)]
+#[derive(Default, Debug)]
 pub struct ProgressCounterTracker {
     errors: Arc<Mutex<Vec<AssetErrorMeta>>>,
     num_failed: Arc<AtomicUsize>,

amethyst_network/Cargo.toml

@@ -4,7 +4,8 @@ version = "0.6.1"
 authors = [
 	"Joël Lupien (Jojolepro) <[email protected]>",
 	"Lucio Franco (LucioFranco) <[email protected]>",
-	"Timon Post (TimonPost) <https://github.com/TimonPost>"
+	"Timon Post (TimonPost) <https://github.com/TimonPost>",
+	"Justin LeFebvre (jstnlef) <https://github.com/jstnlef>"
 ]
 edition = "2018"
 description = "Amethyst networking crate"
@@ -24,13 +25,7 @@ nightly = [ "amethyst_core/nightly" ]
 [dependencies]
 amethyst_core = { path = "../amethyst_core", version = "0.8.1" }
 amethyst_error = { path = "../amethyst_error", version = "0.3.0" }
-serde = { version = "1", features = ["derive"] }
-shrev = "1.0"
-shred = "0.9"
-bincode = "1.0"
-log = "0.4.6"
-uuid = { version = "0.7.1", features = ["v4","serde"] }
+bytes = "0.4"
+laminar = "0.3"
+log = "0.4"
 thread_profiler = { version = "0.3" , optional = true }
-laminar = "0.2.3"
-err-derive = "0.1"
-crossbeam-channel = "0.3.9"

amethyst_network/README.md

@@ -13,25 +13,27 @@
 [s5]: https://img.shields.io/discord/425678876929163284.svg?logo=discord
 [l5]: https://discord.gg/GnP5Whs
 
-The networking crate for the `amethyst` game engine. This crate provides the API and functionality which application developers will normally use to develop multiplayer games. The main engine can be found at https://amethyst.rs.
+This is the networking crate for the `amethyst` game engine. This crate provides the building blocks which
+application developers can use to develop online multiplayer games. The main engine can be found at https://amethyst.rs.
 
-This project is still at an early stage. We are currently designing and implementing a fast/robust networking system on top of specs. To exercise our implementation, we are creating a small test game which we will make public when we feel it's in a good place. Eventually, as we gain more confidence in our solution, we will move stable functionality over from that game to amethyst network.
+This project is still at an early stage. We are currently designing and implementing a robust networking system on
+top of specs. To exercise our implementation, we are creating a small test game which we will make public when we feel
+it's in a good place. Eventually, as we gain more confidence in our solution, we will move stable functionality over
+from that game to amethyst network.
 
 Currently, amethyst network supports:
-- Reliable (ordered, sequenced) UDP.
-- Unreliable (sequenced) UDP.
-- Connect/Disconnect events from clients.
-- Automatic creation of `NetConnection` on client connect.
-- Automatic Fragmentation of big packets
-
-We use [laminar](https://github.com/amethyst/laminar) as the application layer communication protocol.
+- `NetworkSimulationTime` resource to decouple simulation frame rate from ECS frame rate
+- An API abstraction for various transport layer network systems
+- Implementations of the [laminar](https://github.com/amethyst/laminar) and UDP transport layers
+- Connection lifecycle management
 
 ## Contribution
 
-Unless you explicitly state otherwise, any Contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any
-additional terms or conditions.
+Unless you explicitly state otherwise, any Contribution intentionally submitted for inclusion in the work by you, as
+defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions.
 
-For more information or help, please come find us on the amethyst discord server's `#net` channel. We are working on architecture, design, and roadmaps and can definitely use some helping hands, don't hesitate :). 
+For more information or help, please come find us on the amethyst discord server's `#net` channel. We are working on
+architecture, design, and roadmaps and can definitely use some helping hands, don't hesitate :).
 
 ## License