diff --git a/Cargo.lock b/Cargo.lock index 1fce8987c91386c7adcd965591568be37d873a1d..2316718da774089cd78e7ae30764d9009feb548c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -453,8 +453,9 @@ dependencies = [ [[package]] name = "bevy_kira_audio" -version = "0.10.0" -source = "git+https://github.com/NiklasEi/bevy_kira_audio.git?rev=8e2ee7ffb675163cd01083d46f12aeba634f9f8f#8e2ee7ffb675163cd01083d46f12aeba634f9f8f" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7d902ab6a15bd45af04d47b208a24f95205d8d2fd1fa15dd4e86a570fad813b" dependencies = [ "anyhow", "bevy", @@ -1823,7 +1824,8 @@ checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" [[package]] name = "iyes_loopless" version = "0.7.0" -source = "git+https://lab.lcr.gr/microhacks/iyes-loopless.git?rev=289746aceb673d0863d5c846d4d4511e6f15c224#289746aceb673d0863d5c846d4d4511e6f15c224" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83c256fe0800ac12ca8d37eb6018e7881893c79ac0849bbc3eb37e1be6922433" dependencies = [ "bevy_app", "bevy_ecs", @@ -2055,7 +2057,7 @@ dependencies = [ [[package]] name = "musicbox" version = "0.2.0-pre.1" -source = "git+https://lab.lcr.gr/microhacks/micro-bevy-musicbox.git?rev=fc8da57c9cc174d174dd3200d2880096a39c733f#fc8da57c9cc174d174dd3200d2880096a39c733f" +source = "git+https://lab.lcr.gr/microhacks/micro-bevy-musicbox.git?rev=5ab4120a983e54ef0786ddca43b92a70605efd49#5ab4120a983e54ef0786ddca43b92a70605efd49" dependencies = [ "bevy", "bevy_kira_audio", diff --git a/README.md b/README.md index 44b0e0ffb59d4e56830462582805edbb96e4fc1e..d2ef651eda9f8cfc67b41253fb721355291c95da 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,15 @@ # Bevy 2D Template +## Includes + +- Workspace configuration w/ assets dir +- Splash screen +- [Websockets](https://lab.lcr.gr/microhacks/micro-bevy-remote-events) +- [High level audio player](https://lab.lcr.gr/microhacks/micro-bevy-musicbox) +- Basic component based follow-camera setup +- Convenience loader for assets +- Asset loading state to preload all assets + ## Usage Write some code, ya dig? @@ -35,9 +45,13 @@ Building the game for desktop will use a docker container to manage dependancies your workspace to perform the build. `make build-linux` and `make build-windows` can be run on any platform with docker installed, perfect for cross-compilation without juggling dependencies. `make build-web` -## Includes +## License -- Workspace configuration w/ assets dir -- Splash screen -- Websockets -- High level audio player \ No newline at end of file +This template (and the code it contains) uses the GPL-3.0 license. This is unlikely to be changed in future on +a template-wide basis, but if you would like to discuss having this template licensed differently for a specific +project, please email [louis@microhacks.co.uk](mailto:louis@microhacks.co.uk). + +The logo found in `assets/splash.png` is licensed under the following license for use only within the context of this template. +For clarity: Changing this splash screen asset is recommended, and won't be subject to any licensing + +<p xmlns:cc="http://creativecommons.org/ns#" xmlns:dct="http://purl.org/dc/terms/"><span property="dct:title">Microhacks Logo</span> by <span property="cc:attributionName">Microhacks Ltd</span> is licensed under <a href="http://creativecommons.org/licenses/by-nc-nd/4.0/?ref=chooser-v1" target="_blank" rel="license noopener noreferrer" style="display:inline-block;">CC BY-NC-ND 4.0<img style="height:22px!important;margin-left:3px;vertical-align:text-bottom;" src="https://mirrors.creativecommons.org/presskit/icons/cc.svg?ref=chooser-v1"><img style="height:22px!important;margin-left:3px;vertical-align:text-bottom;" src="https://mirrors.creativecommons.org/presskit/icons/by.svg?ref=chooser-v1"><img style="height:22px!important;margin-left:3px;vertical-align:text-bottom;" src="https://mirrors.creativecommons.org/presskit/icons/nc.svg?ref=chooser-v1"><img style="height:22px!important;margin-left:3px;vertical-align:text-bottom;" src="https://mirrors.creativecommons.org/presskit/icons/nd.svg?ref=chooser-v1"></a></p> \ No newline at end of file diff --git a/game_core/Cargo.toml b/game_core/Cargo.toml index df73370084ea9a841ca5c1991a7c1cbc4f9c439b..36b103bd455885f3ee295706956dc55116bff535 100644 --- a/game_core/Cargo.toml +++ b/game_core/Cargo.toml @@ -6,16 +6,15 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -#iyes_loopless = "0.6.1" fastrand = "1.7" anyhow = "1" log = "0.4" thiserror = "1" serde = "1" serde_json = "1" -iyes_loopless = { git = "https://lab.lcr.gr/microhacks/iyes-loopless.git", rev = "289746aceb673d0863d5c846d4d4511e6f15c224" } +iyes_loopless = "0.7" -musicbox = { git = "https://lab.lcr.gr/microhacks/micro-bevy-musicbox.git", rev = "fc8da57c9cc174d174dd3200d2880096a39c733f"} +musicbox = { git = "https://lab.lcr.gr/microhacks/micro-bevy-musicbox.git", rev = "5ab4120a983e54ef0786ddca43b92a70605efd49"} remote_events = { git = "https://lab.lcr.gr/microhacks/micro-bevy-remote-events.git", rev = "be0c6b43a73e4c5e7ece20797e3d6f59340147b4"} [dependencies.bevy] diff --git a/game_core/src/multiplayer/mod.rs b/game_core/src/multiplayer/mod.rs index 0cd25126a622c6f3d902424e4f697097ce044245..8d6a44b8f56628d1f4978ec49190816611e03e9c 100644 --- a/game_core/src/multiplayer/mod.rs +++ b/game_core/src/multiplayer/mod.rs @@ -5,6 +5,7 @@ use serde::{Deserialize, Serialize}; #[serde(tag = "type")] pub enum IncomingEvent { #[default] + #[serde(rename = "void")] Void, } @@ -19,8 +20,10 @@ impl FromSocketMessage for IncomingEvent { } #[derive(Clone, Copy, Debug, Default, Serialize, Deserialize)] +#[serde(tag = "type")] pub enum OutgoingEvent { #[default] + #[serde(rename = "void")] Void, }