Merge branch 'master' into 'master'

Stopped syncing time

See merge request veloren/veloren!141

Former-commit-id: 654d855682af6300e964955f2784ef0b8932aaca
This commit is contained in:
Joshua Barretto 2019-05-16 23:27:49 +00:00
commit ba8c8cfdf3

View File

@ -114,9 +114,9 @@ impl State {
// Register synced resources used by the ECS // Register synced resources used by the ECS
ecs.add_resource_synced(TimeOfDay(0.0)); ecs.add_resource_synced(TimeOfDay(0.0));
ecs.add_resource_synced(Time(0.0));
// Register unsynced resources used by the ECS // Register unsynced resources used by the ECS
ecs.add_resource(Time(0.0));
ecs.add_resource(DeltaTime(0.0)); ecs.add_resource(DeltaTime(0.0));
ecs.add_resource(TerrainMap::new().unwrap()); ecs.add_resource(TerrainMap::new().unwrap());
} }