Merge master into DC/GC XP boost branch
This commit is contained in:
@@ -123,6 +123,7 @@ struct ServerState : public std::enable_shared_from_this<ServerState> {
|
||||
uint64_t client_ping_interval_usecs = 30000000;
|
||||
uint64_t client_idle_timeout_usecs = 60000000;
|
||||
uint64_t patch_client_idle_timeout_usecs = 300000000;
|
||||
uint64_t psopeeps_dcv2_exp_multiplier = 5;
|
||||
bool is_debug = false;
|
||||
bool ip_stack_debug = false;
|
||||
bool allow_unregistered_users = false;
|
||||
@@ -177,6 +178,7 @@ struct ServerState : public std::enable_shared_from_this<ServerState> {
|
||||
bool enable_blueballz = false;
|
||||
int64_t blueballz_enemy_hp_scale_tier = -1; // -1 = disabled; 0..10 = scale BB enemy HP in stream files
|
||||
bool enable_hardcore_mode = false;
|
||||
bool enable_test_mode = false;
|
||||
int8_t blueballz_max_tier = 10;
|
||||
int8_t blueballz_unlocked_tier_v2 = 0;
|
||||
int8_t blueballz_unlocked_tier_v3 = 0;
|
||||
|
||||
Reference in New Issue
Block a user