Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
Change timeout to 20s

See merge request veloren/veloren!44

Former-commit-id: d2d90a870a7a429f6e0bdee86e1b0c95d362840d
This commit is contained in:
Joshua Barretto 2019-04-17 15:08:00 +00:00
commit cacb1855fd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/lib.rs
View File

@ -26,7 +26,7 @@ use common::{
msg::{ClientMsg, ServerMsg}, msg::{ClientMsg, ServerMsg},
}; };
const SERVER_TIMEOUT: f64 = 5.0; // Seconds const SERVER_TIMEOUT: f64 = 20.0; // Seconds
pub enum Event { pub enum Event {
Chat(String), Chat(String),

2
server/src/lib.rs
View File

@ -25,7 +25,7 @@ use threadpool::ThreadPool;
use vek::*; use vek::*;
use world::World; use world::World;
const CLIENT_TIMEOUT: f64 = 5.0; // Seconds const CLIENT_TIMEOUT: f64 = 20.0; // Seconds
pub enum Event { pub enum Event {
ClientConnected { entity: EcsEntity }, ClientConnected { entity: EcsEntity },