Merge branch 'master' into 'release'

Master

See merge request Isleward/isleward!477

src/client/ui/templates/mainMenu/mainMenu.js

@@ -31,7 +31,6 @@ define([
 			this.el.find('.btnLogOut').on('click', this.logOut.bind(this));
 			this.el.find('.btnContinue').on('click', this.toggle.bind(this));
 			this.el.find('.btnPatreon').on('click', this.patreon.bind(this));
-			this.el.find('.btnIssue').on('click', this.reportIssue.bind(this));
 
 			this.onEvent('onResize', this.onResize.bind(this));
 		},
@@ -45,10 +44,6 @@ define([
 			return false;
 		},
 		
-		reportIssue: function () {
-			window.open('https://gitlab.com/Isleward/isleward/issues/new', '_blank');
-		},
-
 		patreon: function () {
 			window.open('https://patreon.com/bigbadwaffle', '_blank');
 		},

src/client/ui/templates/mainMenu/template.html

@@ -4,5 +4,4 @@
 	<div class="btn btnCharSelect">Character Select</div>
 	<div class="btn btnLogOut">Log Out</div>
 	<div class="btn btnPatreon">Pledge on Patreon</div>
-	<div class="btn btnIssue">Report an Issue</div>
 </div>

src/client/ui/templates/online/online.js

@@ -137,6 +137,8 @@ define([
 					text: isBlocked ? 'unblock' : 'block',
 					callback: this.block.bind(this, char.name)
 				}, ...extraActions];
+
+				events.emit('onBeforeOnlineListContext', char.id, actions);
 			
 				events.emit('onContextMenu', actions, e);
 			}

src/client/ui/templates/target/target.js

@@ -106,13 +106,14 @@ define([
 		},
 
 		onAction: function (action, sendTargetServerId) {
-			const { threadModule, cpn, method, data = {} } = action;
+			const { threadModule, module: actionModule, cpn, method, data = {} } = action;
 			if (method === 'performAction')
 				data.data.playerId = this.target.id;
-			else if (threadModule) 
+			else if (actionModule || threadModule)
 				data.targetId = sendTargetServerId ? this.target.serverId : this.target.id;
 
 			client.request({
+				module: actionModule,
 				threadModule,
 				cpn,
 				method,

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

@@ -45,6 +45,7 @@
 		.title {
 			color: @white;
 		}
+
 	}
 
 	.buttons {
@@ -67,7 +68,18 @@
 			&:hover {
 				background-color: @blueB;
 			}
+
+		}
+
+	}
+
+	a {
+		color: @blueB;
+
+		&:hover {
+			color: @blueA;
 		}
+
 	}
 
 }

src/server/config/skins.js

@@ -39,7 +39,21 @@ let config = {
 		name: 'Thief 2',
 		sprite: [7, 0]
 	},
+	//Misc
+	1.9: {
+		name: 'Resplendent Wizard',
+		sprite: [1, 0]
+	},
+	'1.10': {
+		name: 'Apprentice Druid',
+		sprite: [4, 1]
+	},
+	1.11: {
+		name: 'Sashed Wizard',
+		sprite: [5, 1]
+	},
 
+	//Faction Skins
 	'2.0': {
 		name: 'Gaekatlan Druid',
 		sprite: [0, 4]
@@ -114,6 +128,11 @@ let config = {
 		name: 'Frozen Invoker',
 		spritesheet: 'images/skins/0012.png',
 		sprite: [1, 0]
+	},
+	12.2: {
+		name: 'Frozen Duelist',
+		spritesheet: 'images/skins/0012.png',
+		sprite: [1, 0]
 	}
 };