Merge branch 'master' into server

99f60761 · nanahira · e99cc8e5 · af45e60a · 99f60761 · 16de746d
Commit 99f60761 authored Jul 09, 2018 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

gframe/game.cpp gframe/game.cpp +1 -1

ocgcore ocgcore +1 -1

No files found.
--- a/gframe/game.cpp
+++ b/gframe/game.cpp
@@ -1557,7 +1557,7 @@ void Game::ShowCardInfo(int code, bool resize) {
 		}
 		stDataInfo->setText(formatBuffer);
 		int offset_arrows = 0;
-		if(cd.type & TYPE_LINK && cd.level > 5 && window_size.Width < 1220.0)
+		if(cd.type & TYPE_LINK && cd.level > 5 && window_size.Width < 1290.0)
 			offset_arrows = 15;
 		stDataInfo->setRelativePosition(rect<s32>(15, 60, 300 * xScale - 13, (83 + offset_arrows)));
 		//stSetName->setRelativePosition(rect<s32>(15, (83 + offset_arrows) * yScale, 296 * xScale, (83 + offset_arrows) * yScale + offset));

--- a/ocgcore @ 16de746d
+++ b/ocgcore @ 16de746d
-Subproject commit 8d2c3b0d947b6d6ce0d3135ffb60a3a7ec3ba550
+Subproject commit 16de746dba127457ddd9e51e165f2cfa262784c7