ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into renderer_refactoring

Browse Source
This commit is contained in:
Benau 2016-11-04 21:06:42 +08:00
commit 214ea6801b
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/font/bold_face.hpp
View File

@ -36,7 +36,7 @@ private:
// ------------------------------------------------------------------------
virtual unsigned int getScalingFactorTwo() const OVERRIDE { return 120; }
// ------------------------------------------------------------------------
virtual bool isBold() const { return true; }
virtual bool isBold() const OVERRIDE { return true; }
// ------------------------------------------------------------------------
virtual int shapeOutline(FT_Outline* outline) const OVERRIDE;

1
src/font/font_with_face.hpp
View File

@ -27,6 +27,7 @@
#include <cassert>
#include <map>
#include <set>
#include <string>
#include <ft2build.h>
#include FT_FREETYPE_H

2
src/modes/world.cpp
View File

@ -693,7 +693,7 @@ void World::resetAllKarts()
if ((*i)->isGhostKart()) continue;
Vec3 xyz = (*i)->getXYZ();
//start projection from top of kart
Vec3 up_offset(0, 0.5f * ((*i)->getKartHeight()), 0);
Vec3 up_offset = (*i)->getNormal() * (0.5f * ((*i)->getKartHeight()));
(*i)->setXYZ(xyz+up_offset);
bool kart_over_ground = m_track->findGround(*i);