diff --git a/src/gui/EndGameGui.hx b/src/gui/EndGameGui.hx
index 81c35757..2bc3eb28 100644
--- a/src/gui/EndGameGui.hx
+++ b/src/gui/EndGameGui.hx
@@ -128,8 +128,8 @@ class EndGameGui extends GuiControl {
egResult.extent = new Vector(244, 69);
egResult.text.text = ' ${Util.formatTime(timeState.gameplayClock)}
${mission.game == "gold" || mission.game.toLowerCase() == "ultra" ? 'Gold Time:' : 'Platinum Time:'}
${mission.ultimateTime != 0 ? 'Ultimate Time:
' : ''}
Time Passed:
Clock Bonuses:';
leftColumn.text.dropShadow = {
- dx: 1,
- dy: 1,
+ dx: 1 * Settings.uiScale,
+ dy: 1 * Settings.uiScale,
alpha: 0.5,
color: 0x777777
};
@@ -362,8 +362,8 @@ class EndGameGui extends GuiControl {
rightColumn.text.textColor = 0xFFFFFF;
rightColumn.text.text = '${Util.formatTime(mission.qualifyTime == Math.POSITIVE_INFINITY ? 5999.999 : mission.qualifyTime)}
${Util.formatTime(mission.goldTime)}
${mission.ultimateTime != 0 ? '${Util.formatTime(mission.ultimateTime)}
' : ''}
${Util.formatTime(elapsedTime)}
${Util.formatTime(bonusTime)}';
rightColumn.text.dropShadow = {
- dx: 1,
- dy: 1,
+ dx: 1 * Settings.uiScale,
+ dy: 1 * Settings.uiScale,
alpha: 0.5,
color: 0x777777
};
diff --git a/src/gui/EnterNameDlg.hx b/src/gui/EnterNameDlg.hx
index 49552bad..a03a6c52 100644
--- a/src/gui/EnterNameDlg.hx
+++ b/src/gui/EnterNameDlg.hx
@@ -88,8 +88,8 @@ class EnterNameDlg extends GuiControl {
var enterNameText = new GuiMLText(domcasual32, mlFontLoader);
enterNameText.text.textColor = 0xFFFFFF;
enterNameText.text.dropShadow = {
- dx: 1,
- dy: 1,
+ dx: 1 * Settings.uiScale,
+ dy: 1 * Settings.uiScale,
alpha: 0.5,
color: 0
};
diff --git a/src/gui/JoinServerGui.hx b/src/gui/JoinServerGui.hx
index 588f5a53..dacab395 100644
--- a/src/gui/JoinServerGui.hx
+++ b/src/gui/JoinServerGui.hx
@@ -85,8 +85,8 @@ class JoinServerGui extends GuiImage {
passwordTitle.justify = Center;
passwordTitle.text.text = "Password Required";
passwordTitle.text.dropShadow = {
- dx: 1,
- dy: 1,
+ dx: 1 * Settings.uiScale,
+ dy: 1 * Settings.uiScale,
alpha: 0.5,
color: 0
};
@@ -134,8 +134,8 @@ class JoinServerGui extends GuiImage {
serverInfo.extent = new Vector(210, 166);
serverInfo.text.text = '
Select a Server
'; serverInfo.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; @@ -316,8 +316,8 @@ class JoinServerGui extends GuiImage { titleText.justify = Center; titleText.text.text = "Join Server"; titleText.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; @@ -329,8 +329,8 @@ class JoinServerGui extends GuiImage { listTitle.extent = new Vector(480, 22); listTitle.text.textColor = 0xDDDDEE; listTitle.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; diff --git a/src/gui/JukeboxDlg.hx b/src/gui/JukeboxDlg.hx index 1c4a8d5a..be04ff7c 100644 --- a/src/gui/JukeboxDlg.hx +++ b/src/gui/JukeboxDlg.hx @@ -51,8 +51,8 @@ class JukeboxDlg extends GuiImage { songTitle.position = new Vector(61, 262); songTitle.extent = new Vector(416, 22); songTitle.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; @@ -64,8 +64,8 @@ class JukeboxDlg extends GuiImage { songStatus.position = new Vector(56, 283); songStatus.extent = new Vector(421, 22); songStatus.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; diff --git a/src/gui/MPEndGameGui.hx b/src/gui/MPEndGameGui.hx index f6cdaa19..5535e23d 100644 --- a/src/gui/MPEndGameGui.hx +++ b/src/gui/MPEndGameGui.hx @@ -175,8 +175,8 @@ class MPEndGameGui extends GuiImage { titleML.horizSizing = Width; titleML.text.textColor = rankColor; titleML.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; diff --git a/src/gui/MPExitGameDlg.hx b/src/gui/MPExitGameDlg.hx index d29a455b..a6b3cbc1 100644 --- a/src/gui/MPExitGameDlg.hx +++ b/src/gui/MPExitGameDlg.hx @@ -128,8 +128,8 @@ class MPExitGameDlg extends GuiControl { exitTitle.justify = Center; exitTitle.text.text = "Ingame Options"; exitTitle.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; @@ -141,8 +141,8 @@ class MPExitGameDlg extends GuiControl { restartTitle.justify = Center; restartTitle.text.text = "Restart:"; restartTitle.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; diff --git a/src/gui/MPKickBanDlg.hx b/src/gui/MPKickBanDlg.hx index 4e10955e..a759178f 100644 --- a/src/gui/MPKickBanDlg.hx +++ b/src/gui/MPKickBanDlg.hx @@ -69,8 +69,8 @@ class MPKickBanDlg extends GuiImage { kickTitle.text.textColor = 0xFFFFFF; kickTitle.text.text = "Kick Players"; kickTitle.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; diff --git a/src/gui/MPMarbleSelectGui.hx b/src/gui/MPMarbleSelectGui.hx index e15ca503..b7643617 100644 --- a/src/gui/MPMarbleSelectGui.hx +++ b/src/gui/MPMarbleSelectGui.hx @@ -83,8 +83,8 @@ class MPMarbleSelectGui extends GuiImage { var titleText = new GuiMLText(markerFelt28, null); titleText.text.textColor = 0xFFFFFF; titleText.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; @@ -98,8 +98,8 @@ class MPMarbleSelectGui extends GuiImage { var marbleText = new GuiMLText(markerFelt24, null); marbleText.text.textColor = 0xFFFFFF; marbleText.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; diff --git a/src/gui/MPMessageGui.hx b/src/gui/MPMessageGui.hx index f5422e9a..d75a5a67 100644 --- a/src/gui/MPMessageGui.hx +++ b/src/gui/MPMessageGui.hx @@ -58,8 +58,8 @@ class MPMessageGui extends GuiImage { title.text.text = titleText; title.text.textColor = 0xFFFFFF; title.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; @@ -73,8 +73,8 @@ class MPMessageGui extends GuiImage { msg.text.text = msgText; msg.text.textColor = 0xFFFFFF; msg.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; diff --git a/src/gui/MPPlayMissionGui.hx b/src/gui/MPPlayMissionGui.hx index 70caeba6..e31ca649 100644 --- a/src/gui/MPPlayMissionGui.hx +++ b/src/gui/MPPlayMissionGui.hx @@ -321,8 +321,8 @@ class MPPlayMissionGui extends GuiImage { pmDesc.position = new Vector(0, 0); pmDesc.extent = new Vector(427, 99); pmDesc.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; @@ -333,8 +333,8 @@ class MPPlayMissionGui extends GuiImage { parTime.position = new Vector(43, 190); parTime.extent = new Vector(416, 44); parTime.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; @@ -384,8 +384,8 @@ class MPPlayMissionGui extends GuiImage { playerListTitle.text.textColor = 0xBDCFE4; playerListTitle.justify = Center; playerListTitle.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; diff --git a/src/gui/MPPreGameDlg.hx b/src/gui/MPPreGameDlg.hx index 057ee172..5bda7356 100644 --- a/src/gui/MPPreGameDlg.hx +++ b/src/gui/MPPreGameDlg.hx @@ -133,8 +133,8 @@ class MPPreGameDlg extends GuiControl { serverTitle.extent = new Vector(525, 30); serverTitle.text.text = Net.isHost ? Settings.serverSettings.name : Net.connectedServerInfo.name; serverTitle.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; @@ -147,8 +147,8 @@ class MPPreGameDlg extends GuiControl { serverDesc.extent = new Vector(525, 66); serverDesc.text.text = Net.isHost ? Settings.serverSettings.description : Net.connectedServerInfo.description; serverDesc.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; @@ -161,8 +161,8 @@ class MPPreGameDlg extends GuiControl { levelName.extent = new Vector(525, 22); levelName.text.text = MarbleGame.instance.world.mission.title; levelName.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; @@ -174,8 +174,8 @@ class MPPreGameDlg extends GuiControl { levelDesc.extent = new Vector(516, 63); levelDesc.text.text = StringTools.htmlEscape(MarbleGame.instance.world.mission.description); levelDesc.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; @@ -187,8 +187,8 @@ class MPPreGameDlg extends GuiControl { playerTitle.extent = new Vector(525, 14); playerTitle.text.text = "Player Status"; playerTitle.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; @@ -203,8 +203,8 @@ class MPPreGameDlg extends GuiControl { dialogImg.addChild(playerListContainer); var playerListLeft = new GuiTextListCtrl(markerFelt18, [], 0xFFFFFF, { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, color: 0, alpha: 1 }); @@ -219,8 +219,8 @@ class MPPreGameDlg extends GuiControl { playerListContainer.addChild(playerListLeft); var playerListRight = new GuiTextListCtrl(markerFelt18, [], 0xFFFFFF, { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, color: 0, alpha: 1 }); diff --git a/src/gui/MPServerDlg.hx b/src/gui/MPServerDlg.hx index 8cb4ce4b..cdf6ce21 100644 --- a/src/gui/MPServerDlg.hx +++ b/src/gui/MPServerDlg.hx @@ -61,8 +61,8 @@ class MPServerDlg extends GuiImage { title.text.text = "Server Settings"; title.text.textColor = 0xFFFFFF; title.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; @@ -129,8 +129,8 @@ class MPServerDlg extends GuiImage { serverName.text.text = "Server Name:"; serverName.text.textColor = 0xFFFFFF; serverName.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; @@ -148,8 +148,8 @@ class MPServerDlg extends GuiImage { serverNameEdit.position = new Vector(3, 3); serverNameEdit.extent = new Vector(291, 29); serverNameEdit.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; @@ -165,8 +165,8 @@ class MPServerDlg extends GuiImage { password.text.text = "Password:"; password.text.textColor = 0xFFFFFF; password.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; @@ -184,8 +184,8 @@ class MPServerDlg extends GuiImage { passwordEdit.position = new Vector(3, 3); passwordEdit.extent = new Vector(291, 29); passwordEdit.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; @@ -201,8 +201,8 @@ class MPServerDlg extends GuiImage { serverDescTitle.text.text = "Server Info:"; serverDescTitle.text.textColor = 0xFFFFFF; serverDescTitle.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; @@ -220,8 +220,8 @@ class MPServerDlg extends GuiImage { serverDescEdit.position = new Vector(3, 3); serverDescEdit.extent = new Vector(291 + 93, 29); serverDescEdit.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; @@ -237,8 +237,8 @@ class MPServerDlg extends GuiImage { maxPlayers.text.text = "Max Players: " + curServerMaxPlayers; maxPlayers.text.textColor = 0xFFFFFF; maxPlayers.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; @@ -268,8 +268,8 @@ class MPServerDlg extends GuiImage { forceSpectators.text.text = "Force Spectators:"; forceSpectators.text.textColor = 0xFFFFFF; forceSpectators.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; @@ -291,8 +291,8 @@ class MPServerDlg extends GuiImage { quickRespawn.text.text = "Allow Quick Respawn:"; quickRespawn.text.textColor = 0xFFFFFF; quickRespawn.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; @@ -314,8 +314,8 @@ class MPServerDlg extends GuiImage { competitive.text.text = "Competitive Mode:"; competitive.text.textColor = 0xFFFFFF; competitive.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; diff --git a/src/gui/MainMenuGui.hx b/src/gui/MainMenuGui.hx index e4f9e5fe..26090b17 100644 --- a/src/gui/MainMenuGui.hx +++ b/src/gui/MainMenuGui.hx @@ -184,8 +184,8 @@ class MainMenuGui extends GuiImage { versionText.extent = new Vector(97, 72); versionText.text.text = "1.5.4
"; versionText.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; diff --git a/src/gui/MarbleSelectGui.hx b/src/gui/MarbleSelectGui.hx index db4948a0..715eb2f8 100644 --- a/src/gui/MarbleSelectGui.hx +++ b/src/gui/MarbleSelectGui.hx @@ -554,8 +554,8 @@ class MarbleSelectGui extends GuiImage { var titleText = new GuiMLText(markerFelt28, null); titleText.text.textColor = 0xFFFFFF; titleText.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; @@ -569,8 +569,8 @@ class MarbleSelectGui extends GuiImage { var marbleText = new GuiMLText(markerFelt24, null); marbleText.text.textColor = 0xFFFFFF; marbleText.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; diff --git a/src/gui/OptionsDlg.hx b/src/gui/OptionsDlg.hx index c7b7e050..5390a5a7 100644 --- a/src/gui/OptionsDlg.hx +++ b/src/gui/OptionsDlg.hx @@ -148,8 +148,8 @@ class OptionsDlg extends GuiImage { textObj.text.text = text; textObj.text.textColor = 0xFFFFFF; textObj.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; @@ -226,8 +226,8 @@ class OptionsDlg extends GuiImage { textObj.text.text = text; textObj.text.textColor = 0xFFFFFF; textObj.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; @@ -410,8 +410,8 @@ class OptionsDlg extends GuiImage { textObj.text.text = text; textObj.text.textColor = 0xFFFFFF; textObj.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; @@ -435,8 +435,8 @@ class OptionsDlg extends GuiImage { textObj.text.text = "Touch Controls"; textObj.text.textColor = 0xFFFFFF; textObj.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; diff --git a/src/gui/PlayGui.hx b/src/gui/PlayGui.hx index ac7e4352..d11845c7 100644 --- a/src/gui/PlayGui.hx +++ b/src/gui/PlayGui.hx @@ -669,8 +669,8 @@ class PlayGui { } playerListCtrl = new GuiMLTextListCtrl(bfont, [], imgLoader, { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, color: 0, alpha: 1 }); @@ -682,8 +682,8 @@ class PlayGui { playerListContainer.addChild(playerListCtrl); playerListScoresCtrl = new GuiMLTextListCtrl(bfont, [], imgLoader, { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, color: 0, alpha: 1 }); @@ -1183,8 +1183,8 @@ class PlayGui { middleMsg.justify = Center; middleMsg.text.textColor = color; middleMsg.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; // new h2d.filter.DropShadow(1.414, 0.785, 0x000000F, 1, 0, 0.4, 1, true); diff --git a/src/gui/PlayMissionGui.hx b/src/gui/PlayMissionGui.hx index b2fbdc85..fa01e92a 100644 --- a/src/gui/PlayMissionGui.hx +++ b/src/gui/PlayMissionGui.hx @@ -893,8 +893,8 @@ class PlayMissionGui extends GuiImage { var currentMission = currentList[currentSelection]; pmScoreText.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; @@ -987,16 +987,16 @@ class PlayMissionGui extends GuiImage { } pmDescription.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; pmDescription.text.lineSpacing = -1; pmDescriptionRight.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; @@ -1040,14 +1040,14 @@ class PlayMissionGui extends GuiImage { pmDescription.text.text = descText; pmParText.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 }; pmParTextRight.text.dropShadow = { - dx: 1, - dy: 1, + dx: 1 * Settings.uiScale, + dy: 1 * Settings.uiScale, alpha: 0.5, color: 0 };