Merge branch 'main' into linux
This commit is contained in:
commit
84b3c3261c
3 files changed
+5
-5
No files matched your search
Binary file not shown.
+1
-1
@@ -1695,7 +1695,7 @@ namespace ZL
|
|||||||
std::string pingMsg = "UPD:" + std::to_string(now_ms) + ":" + Environment::shipState.formPingMessageContent();
|
std::string pingMsg = "UPD:" + std::to_string(now_ms) + ":" + Environment::shipState.formPingMessageContent();
|
||||||
|
|
||||||
networkClient->Send(pingMsg);
|
networkClient->Send(pingMsg);
|
||||||
std::cout << "Sending: " << pingMsg << std::endl;
|
//std::cout << "Sending: " << pingMsg << std::endl;
|
||||||
pingTimer = 0.0f;
|
pingTimer = 0.0f;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -31,8 +31,8 @@ constexpr long long PLAYER_TIMEOUT_MS = 10000; //ms — disconnect if no UPD rec
|
|||||||
constexpr float PROJECTILE_VELOCITY = 600.f;
|
constexpr float PROJECTILE_VELOCITY = 600.f;
|
||||||
constexpr float PROJECTILE_LIFE = 15000.f; //ms
|
constexpr float PROJECTILE_LIFE = 15000.f; //ms
|
||||||
|
|
||||||
const float projectileHitRadius = 1.5f * 4;
|
const float projectileHitRadius = 2.5f * 4;
|
||||||
const float boxCollisionRadius = 2.0f * 4;
|
const float boxCollisionRadius = 3.0f * 4;
|
||||||
const float shipCollisionRadius = 15.0f * 3;
|
const float shipCollisionRadius = 15.0f * 3;
|
||||||
const float BOX_PICKUP_RADIUS = shipCollisionRadius * 3;
|
const float BOX_PICKUP_RADIUS = shipCollisionRadius * 3;
|
||||||
const float npcCollisionRadius = 5.0f * 3;
|
const float npcCollisionRadius = 5.0f * 3;
|
||||||
|
|||||||
Reference in new issue
Block a user