NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GL - M,L controls activating/deactivating the window. lower threshhold for dmg

This commit is contained in:
Erik Persson 2014-02-27 13:09:45 +01:00
parent 19aa8e5ed4
commit 8111e9f51e
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Code/Game/GameClient/GameClientState/GamingUI.cpp
View File

@ -182,5 +182,12 @@ void GamingUI::OnKeyRelease(Enum::SAKI key, Keyboard* sender)
case SAKI_D: this->key_strafeRight = false;
break;
}
//DEBUG:
if(key == SAKI_L)
this->sharedData->mouseDevice->Deactivate();
if(key == SAKI_M)
this->sharedData->mouseDevice->Activate();
}

2
Code/Game/GameLogic/CollisionManager.cpp
View File

@ -193,7 +193,7 @@ using namespace GameLogic;
Oyster::Math::Float damageDone = 0.0f;
Oyster::Math::Float forceThreashHold = 100.0f; //FIX: balance this
Oyster::Math::Float forceThreashHold = 50.0f; //FIX: balance this
if(impactPower > forceThreashHold) //should only take damage if the force is high enough
{