Merge branch 'master' into '1500-elemental-floating-numbers'

# Conflicts:
#   src/client/ui/templates/options/options.js

src/client/js/misc/helpers.js

@@ -133,5 +133,8 @@ define([], function () {
 	window.scale = isMobile ? 32 : 40;
 	window.scaleMult = isMobile ? 4 : 5;
 
+	if (!window.navigator.vibrate)
+		window.navigator.vibrate = () => {};
+
 	return window._;
 });

src/client/ui/templates/options/options.js

@@ -233,6 +233,7 @@ define([
 			this.onToggleQualityIndicators(config.qualityIndicators);
 			this.onToggleUnusableIndicators(config.unusableIndicators);
 			this.onToggleLastChannel(config.rememberChatChannel);
+			this.onTogglePartyView(config.partyView);
 			this.onToggleDamageNumbers(config.damageNumbers);
 			
 			this.onVolumeChange({

src/client/ui/templates/passives/passives.js

@@ -1,6 +1,4 @@
 let zoom = 1;
-if (isMobile)
-	zoom /= 2;
 
 define([
 	'js/system/events',

src/client/ui/templates/terms/styles.less

@@ -87,4 +87,8 @@
 .mobile .uiTerms {
 	height: 80%;
 	margin-top: 0px;
+
+	.logo {
+		display: none;
+	}
 }

src/server/components/auth.js

@@ -239,8 +239,6 @@ module.exports = {
 			return;
 		}
 
-		this.username = credentials.username;
-
 		let storedPassword = await io.getAsync({
 			key: credentials.username,
 			table: 'login',

src/server/components/follower.js

@@ -35,8 +35,8 @@ module.exports = {
 		let obj = this.obj;
 		let mob = obj.mob;
 
-		mob.originX = master.x + ~~((Math.random() * 2) * 2) - 1;
-		mob.originY = master.y + ~~((Math.random() * 2) * 2) - 1;
+		mob.originX = master.x;
+		mob.originY = master.y;
 
 		return null;
 	},