Merge master and build

2024-08-30 18:12:32 +00:00 · 2020-01-16 05:27:30 -08:00
parent 71a39c3677 8d2c69673d
commit d82e93b39f
158 changed files with 5172 additions and 2247 deletions
--- a/common/src/sys/controller.rs
+++ b/common/src/sys/controller.rs
@ -2,6 +2,7 @@ use crate::{
    comp::{ControlEvent, Controller},
    event::{EventBus, LocalEvent, ServerEvent},
    state::DeltaTime,
+    sync::{Uid, UidAllocator},
 };
 use specs::{
    saveload::{Marker, MarkerAllocator},