Skip to content

Disable controller input during startup #844

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: unstable
Choose a base branch
from
Open

Disable controller input during startup #844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
49ccd8f
Fix linux (fedora) compilation issues
Jun 30, 2016
71daa49
thegamesdb legacy API fix
benbull Aug 12, 2018
d24c0cc
Merge pull request #761 from benbull/master
Aloshi Aug 26, 2018
9cc42ad
Merge pull request #594 from codinghipster/master
Aloshi Aug 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion es-app/src/scrapers/GamesDBScraper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ const std::map<PlatformId, const char*> gamesdb_platformid_map = boost::assign::
void thegamesdb_generate_scraper_requests(const ScraperSearchParams& params, std::queue< std::unique_ptr<ScraperRequest> >& requests,
std::vector<ScraperSearchResult>& results)
{
std::string path = "thegamesdb.net/api/GetGame.php?";
std::string path = "legacy.thegamesdb.net/api/GetGame.php?";

std::string cleanName = params.nameOverride;
if(cleanName.empty())
Expand Down
2 changes: 1 addition & 1 deletion es-core/src/Util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ std::string strToUpper(const std::string& str)
}


#if _MSC_VER < 1800
#if defined(_WIN32) && _MSC_VER < 1800
float round(float num)
{
return (float)((int)(num + 0.5f));
Expand Down
2 changes: 2 additions & 0 deletions es-core/src/Util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ Eigen::Affine3f roundMatrix(const Eigen::Affine3f& mat);
Eigen::Vector3f roundVector(const Eigen::Vector3f& vec);
Eigen::Vector2f roundVector(const Eigen::Vector2f& vec);

#if defined(_WIN32) && _MSC_VER < 1800
float round(float num);
#endif

std::string getCanonicalPath(const std::string& str);

Expand Down