Merge branch 'master'

Conflicts:
	CHANGELOG.md
	Cargo.toml
	adapters/bevy/shared/src/entity.rs
	client/src/client.rs
	default_world/Cargo.toml
	default_world/src/lib.rs
	default_world/src/world.rs
	demos/basic/client/app/Cargo.toml
	demos/basic/server/Cargo.toml
	demos/bevy/shared/Cargo.toml
	demos/default_world/Cargo.toml
	demos/default_world/src/lib.rs
	demos/default_world/src/world.rs
	demos/demo_utils/demo_world/Cargo.toml
	demos/demo_utils/demo_world/src/lib.rs
	demos/demo_utils/demo_world/src/world.rs
	demos/macroquad/client/Cargo.toml
	demos/macroquad/server/Cargo.toml

Cargo.toml

@@ -10,6 +10,9 @@ members = [
     "adapters/hecs/client",
     "adapters/hecs/server",
     "adapters/hecs/shared",
+    "adapters/bevy/client",
+    "adapters/bevy/server",
+    "adapters/bevy/shared",
     "demos/basic/server",
     "demos/basic/shared",
     "demos/basic/client/app",

README.md

@@ -1,4 +1,3 @@
-[![Build Status](https://img.shields.io/circleci/project/github/naia-rs/naia.svg)](https://circleci.com/gh/naia-rs/naia)
 [![Latest Version](https://img.shields.io/crates/v/naia-server.svg)](https://crates.io/crates/naia-server)
 [![API Documentation](https://docs.rs/naia-server/badge.svg)](https://docs.rs/naia-server)
 ![](https://tokei.rs/b1/github/naia-rs/naia)

adapters/bevy/client/Cargo.toml

@@ -1,7 +1,8 @@
 [package]
 name = "naia-bevy-client"
-version = "0.1.0"
+version = "0.7.0-alpha.1"
 authors = ["connorcarpenter <[email protected]>"]
+description = "Library to faciliate naia_client & Bevy interop"
 homepage = "https://github.com/naia-rs/naia"
 repository = "https://github.com/naia-rs/naia"
 license = "MIT OR Apache-2.0"
@@ -13,6 +14,6 @@ maintenance = { status = "actively-developed" }
 [features]
 
 [dependencies]
-naia-client = { path = "../../../client" }
-naia-bevy-shared = { path = "../shared" }
-bevy = { version="0.5.0", default-features=false }
+naia-client = { version = "0.7.0-alpha.1", path = "../../../client", features = ["wbindgen", "multithread"] }
+naia-bevy-shared = { version = "0.7.0-alpha.1", path = "../shared" }
+bevy = { version="=0.5.0", default-features=false }

adapters/bevy/server/Cargo.toml

@@ -1,7 +1,8 @@
 [package]
 name = "naia-bevy-server"
-version = "0.1.0"
+version = "0.7.0-alpha.1"
 authors = ["connorcarpenter <[email protected]>"]
+description = "Library to faciliate naia_server & Bevy interop"
 homepage = "https://github.com/naia-rs/naia"
 repository = "https://github.com/naia-rs/naia"
 license = "MIT OR Apache-2.0"
@@ -15,6 +16,6 @@ use-udp = [ "naia-server/use-udp" ]
 use-webrtc = [ "naia-server/use-webrtc" ]
 
 [dependencies]
-naia-server = { path = "../../../server" }
-naia-bevy-shared = { path = "../shared" }
-bevy = { version="0.5.0", default-features=false }
+naia-server = { version = "0.7.0-alpha.1", path = "../../../server", features = ["multithread"] }
+naia-bevy-shared = { version = "0.7.0-alpha.1", path = "../shared" }
+bevy = { version="=0.5.0", default-features=false }

adapters/bevy/shared/Cargo.toml

@@ -1,7 +1,8 @@
 [package]
 name = "naia-bevy-shared"
-version = "0.1.0"
+version = "0.7.0-alpha.1"
 authors = ["connorcarpenter <[email protected]>"]
+description = "Library to faciliate naia & Bevy interop, functionality shared by client & server versions"
 homepage = "https://github.com/naia-rs/naia"
 repository = "https://github.com/naia-rs/naia"
 license = "MIT OR Apache-2.0"
@@ -13,5 +14,5 @@ maintenance = { status = "actively-developed" }
 [features]
 
 [dependencies]
-naia-shared = { path = "../../../shared" }
-bevy = { version="0.5.0", default-features=false }
+naia-shared = { version = "0.7.0-alpha.1", path = "../../../shared", features = ["wbindgen", "multithread"] }
+bevy = { version="=0.5.0", default-features=false }

adapters/hecs/client/Cargo.toml

@@ -1,12 +1,10 @@
 [package]
 name = "naia-hecs-client"
-version = "0.5.0"
+version = "0.7.0-alpha.1"
 authors = ["connorcarpenter <[email protected]>"]
-description = ""
-documentation = "https://docs.rs/naia-client"
+description = "Library to faciliate naia_client & Hecs interop"
 homepage = "https://github.com/naia-rs/naia"
 repository = "https://github.com/naia-rs/naia"
-readme = "../README.md"
 keywords = ["wasm", "webrtc", "udp", "networking", "gamedev"]
 license = "MIT OR Apache-2.0"
 categories = ["network-programming", "game-development", "wasm", "web-programming"]
@@ -20,6 +18,6 @@ wbindgen = [ "naia-client/wbindgen", "naia-hecs-shared/wbindgen" ]
 mquad = [ "naia-client/mquad", "naia-hecs-shared/mquad" ]
 
 [dependencies]
-naia-client = { path = "../../../client" }
-naia-hecs-shared = { path = "../shared" }
-hecs = { path = "../../../../Forks/hecs" }
+naia-client = { version = "0.7.0-alpha.1", path = "../../../client" }
+naia-hecs-shared = { version = "0.7.0-alpha.1", path = "../shared" }
+hecs = { version = "=0.5.2" }

adapters/hecs/server/Cargo.toml

@@ -1,12 +1,10 @@
 [package]
 name = "naia-hecs-server"
-version = "0.5.0"
+version = "0.7.0-alpha.1"
 authors = ["connorcarpenter <[email protected]>"]
-description = ""
-documentation = "https://docs.rs/naia-client"
+description = "Library to faciliate naia_server & Hecs interop"
 homepage = "https://github.com/naia-rs/naia"
 repository = "https://github.com/naia-rs/naia"
-readme = "../README.md"
 keywords = ["wasm", "webrtc", "udp", "networking", "gamedev"]
 license = "MIT OR Apache-2.0"
 categories = ["network-programming", "game-development", "wasm", "web-programming"]
@@ -20,6 +18,6 @@ use-udp = [ "naia-server/use-udp" ]
 use-webrtc = [ "naia-server/use-webrtc" ]
 
 [dependencies]
-naia-server = { path = "../../../server" }
-naia-hecs-shared = { path = "../shared" }
-hecs = { path = "../../../../Forks/hecs" }
+naia-server = { version = "0.7.0-alpha.1", path = "../../../server" }
+naia-hecs-shared = { version = "0.7.0-alpha.1", path = "../shared" }
+hecs = { version = "=0.5.2" }

adapters/hecs/shared/Cargo.toml

@@ -1,12 +1,10 @@
 [package]
 name = "naia-hecs-shared"
-version = "0.5.0"
+version = "0.7.0-alpha.1"
 authors = ["connorcarpenter <[email protected]>"]
-description = ""
-documentation = "https://docs.rs/naia-client"
+description = "Library to faciliate naia & Hecs interop, functionality shared by client & server versions"
 homepage = "https://github.com/naia-rs/naia"
 repository = "https://github.com/naia-rs/naia"
-readme = "../README.md"
 keywords = ["wasm", "webrtc", "udp", "networking", "gamedev"]
 license = "MIT OR Apache-2.0"
 categories = ["network-programming", "game-development", "wasm", "web-programming"]
@@ -20,5 +18,5 @@ wbindgen = [ "naia-shared/wbindgen" ]
 mquad = [ "naia-shared/mquad" ]
 
 [dependencies]
-naia-shared = { path = "../../../shared" }
-hecs = { path = "../../../../Forks/hecs" }
+naia-shared = { version = "0.7.0-alpha.1", path = "../../../shared" }
+hecs = { version = "=0.5.2" }

client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "naia-client"
-version = "0.5.0"
+version = "0.7.0-alpha.1"
 authors = ["connorcarpenter <[email protected]>"]
 description = "Provides a cross-platform client that can send/receive messages to/from a server, and has a pool of in-scope entities/components that is synced with the server."
 documentation = "https://docs.rs/naia-client"
@@ -20,8 +20,8 @@ wbindgen = [ "naia-client-socket/wbindgen", "naia-shared/wbindgen" ]
 mquad = [ "naia-client-socket/mquad", "naia-shared/mquad" ]
 
 [dependencies]
-naia-client-socket = { path = "../../naia-socket/client" } #{ version = "0.6.0" }
-naia-shared = { version = "0.4.1", path = "../shared" }
+naia-client-socket = { version = "=0.7.0-alpha.1" }
+naia-shared = { version = "=0.7.0-alpha.1", path = "../shared" }
 cfg-if = "0.1.10"
 log = "0.4"
 byteorder = "1.3"

demos/hecs/client/Cargo.toml

@@ -19,7 +19,7 @@ path = "src/main.rs"
 [dependencies]
 naia-hecs-client = { path = "../../../adapters/hecs/client", features = [ "wbindgen" ] }
 naia-hecs-demo-shared = { path = "../shared" }
-hecs = { path = "../../../../Forks/hecs" }
+hecs = { version = "=0.5.2" }
 log = "0.4"
 cfg-if = "0.1.10"
 

demos/hecs/client/src/lib.rs

@@ -8,7 +8,7 @@ cfg_if! {
 
         mod app;
         mod loop_wasm;
-        mod systems
+        mod systems;
 
         use wasm_bindgen::prelude::*;
 

demos/hecs/client/src/systems/events.rs

@@ -1,3 +1,5 @@
+use log::info;
+
 use naia_hecs_client::{Event, WorldProxyMut};
 
 use naia_hecs_demo_shared::protocol::{Protocol, StringMessage};

demos/hecs/server/Cargo.toml

@@ -17,4 +17,4 @@ naia-hecs-demo-shared = { path = "../shared" }
 log = "0.4"
 simple_logger = { version = "1.4" }
 smol = { version = "1.2.4" }
-hecs = { path = "../../../../Forks/hecs" }
+hecs = { version = "=0.5.2" }

derive/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "naia-derive"
-version = "0.3.0"
+version = "0.7.0-alpha.1"
 authors = ["connorcarpenter <[email protected]>"]
 description = "Procedural macros to simplify implementation of Naia ReplicateSafe & ProtocolType traits"
 documentation = "https://docs.rs/naia-derive"

server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "naia-server"
-version = "0.5.0"
+version = "0.7.0-alpha.1"
 authors = ["connorcarpenter <[email protected]>"]
 description = "A server that uses either UDP or WebRTC communication to send/receive messages to/from connected clients, and syncs registered Entities/Components to clients to whom they are in-scope."
 documentation = "https://docs.rs/naia-server"
@@ -23,8 +23,8 @@ use-udp = [ "naia-server-socket/use-udp" ]
 use-webrtc = [ "naia-server-socket/use-webrtc" ]
 
 [dependencies]
-naia-server-socket = { path = "../../naia-socket/server" } #{ version = "0.5.0" }
-naia-shared = { version = "0.4.1", path = "../shared" }
+naia-server-socket = { version = "=0.7.0-alpha.1" }
+naia-shared = { path = "../shared", version = "=0.7.0-alpha.1" }
 log = "0.4"
 slotmap = { version = "0.4" }
 byteorder = "1.3"

shared/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "naia-shared"
-version = "0.4.1"
+version = "0.7.0-alpha.1"
 authors = ["connorcarpenter <[email protected]>"]
 description = "Common functionality shared between naia-server & naia-client crates"
 documentation = "https://docs.rs/naia-shared"
@@ -20,7 +20,7 @@ wbindgen = [ "naia-socket-shared/wbindgen" ]
 mquad = [ "naia-socket-shared/mquad" ]
 
 [dependencies]
-naia-socket-shared = { path = "../../naia-socket/shared" } #{ version = "0.4.1" }
+naia-socket-shared = { version = "=0.7.0-alpha.1" }
 byteorder = "1.3"
 log = "0.4"
 nanoserde = "0.1.29"