mirror of
https://github.com/celisej567/mcpe.git
synced 2026-09-17 20:10:23 +03:00
Merge devel into master (#78)
* * Turn survival back on for now. * * Add TP command. * * Fix fall damage reset. * * Mob hitting works. I've disabled entity shading though. Will get back to it at some point, promise! * * Knockback * * Mobs now rotate when they die. * * Fire fix
This commit is contained in:
@@ -482,10 +482,29 @@ void Minecraft::tickInput()
|
||||
#ifdef ENH_ALLOW_AO
|
||||
else if (getOptions()->isKey(KM_TOGGLEAO, keyCode))
|
||||
{
|
||||
/*
|
||||
// Toggle ambient occlusion.
|
||||
getOptions()->m_bAmbientOcclusion = !getOptions()->m_bAmbientOcclusion;
|
||||
Minecraft::useAmbientOcclusion = getOptions()->m_bAmbientOcclusion;
|
||||
m_pLevelRenderer->allChanged();
|
||||
*/
|
||||
|
||||
// @TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST
|
||||
// Remove this when merging to master.
|
||||
|
||||
if (m_pLevel && m_pLocalPlayer)
|
||||
{
|
||||
Mob* pNewMob = new Mob(m_pLevel);
|
||||
Vec3 pos = m_pLocalPlayer->getPos(0.0f);
|
||||
pNewMob->setPos(pos.x, pos.y, pos.z);
|
||||
m_pLevel->addEntity(pNewMob);
|
||||
}
|
||||
else
|
||||
{
|
||||
LogMsg("Sorry, you can't do that without a level or local player");
|
||||
}
|
||||
|
||||
// @TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user