salmon-engine-projects/space-game001
14
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into linux

Browse Source
This commit is contained in:
Vladislav Khorev 2026-03-10 18:41:47 +00:00
commit 84b3c3261c
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/main_menu/version.png (Stored with Git LFS)
View File

Binary file not shown.

2
src/Space.cpp
View File

@ -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;
} }

4
src/network/ClientState.h
View File

@ -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;