Merge branch 'master' of gitlab.com:Isleward/isleward

CONTRIBUTING.md

@@ -16,29 +16,35 @@ If anything in this contributing guide is not clear, don't hesitate to contact W
 
 ### Issue Labels
 
-Labels can only be assigned by people with Reporter and higher permissions in the project (see [Members](https://gitlab.com/Isleward/isleward/project_members)). People with rights to assign labels should do so regularly to keep the issues organized.  
+Labels can only be assigned by people with Reporter and higher permissions in the project (see [Members](https://gitlab.com/Isleward/isleward/project_members)).
+People with rights to assign labels should do so regularly to keep the issues organized.
 The project is using the following, rather self-explanatory, labels:
 
 * ~Balance
 * ~Bug
 * ~Content
+* ~DevOps
 * ~Draft
+* ~Enhancement
 * ~Feature
+* ~Good first issue
+* ~Mobile
+* ~Mod
 * ~Modding
 * ~Polish
 * ~Refactor
-* ~DevOps
+* ~Suggestion
 
 ### Issue Weights
 
 * In addition to labels, issues tagged with the ~Bug label are also assigned Weights.
 * Bugs are weighed by severity, with 1 being trivial and 5 being severe.
-* Weights can assigned by people with Reporter or higher privileges, but this should only be done by @rstan122 unless instructed otherwise.
+* Weights can assigned by people with Reporter or higher privileges.
 
 ### Confidential Issues
 
 * Confidential issues are issues that are visible only to people with Reporter or higher access rights.
-* Therefore they are very useful for reporting issues that are very sensitive and that not every user should know about.  
+* Therefore they are very useful for reporting issues that are very sensitive and that not every user should know about.
 * To create a confidential issue, simply check the `This issue is confidential and should only be visible to team members with at least Reporter access.` checkbox when creating a new issue.
 
 ### Becoming a Reporter
@@ -62,7 +68,7 @@ The project is using the following branching structure
 
 **release tags** are pointing at the latest commit in `release` at the point of releasing a new version.
 
-**feature branches** are branches in which the actual development happens. The name of a feature branch should always contain the number of the issue that's being addressed (e.g. the `990` in `990-contribuing-rewrite`), be all lowercase with hyphens between words.
+**feature branches** are branches in which the actual development happens. The name of a feature branch should always contain the number of the issue that's being addressed (e.g. the `990` in `990-contribuing-rewrite`), and be all lowercase with hyphens between words.
 
 ### Using SSH keys
 
@@ -86,14 +92,14 @@ Once you are done working on your contribution, you need to submit a merge reque
 
 The merge request should have `master` as its target branch unless arranged otherwise.
 
-You don't need to remove the source branch upon accepting the merge request if the merge request is being made from a fork.  
+You don't need to remove the source branch upon accepting the merge request if the merge request is being made from a fork.
 Squishing commits is usually not recommended as it breaks the ability to rebase nicely in certain cases.
 
-Once your merge request is submitted, GitLab CI will run a few tests on it. Should those tests fail, please address the failures.  
+Once your merge request is submitted, GitLab CI will run a few tests on it. Should those tests fail, please address the failures.
 A Merge Request with passing tests is ready to be merged.
 
 ### Running Isleward
 
 * [Windows](https://gitlab.com/Isleward/isleward/wikis/installation-and-usage-(windows))
 * [Linux](https://gitlab.com/Isleward/isleward/wikis/installation-and-usage-(linux))
-* [MacOS](https://gitlab.com/Isleward/isleward/wikis/installation-and-usage-(macos))
+* [MacOS](https://gitlab.com/Isleward/isleward/wikis/installation-and-usage-(macos))

src/client/ui/templates/messages/messages.js

@@ -296,11 +296,13 @@ define([
 			input.resetKeys();
 
 			this.el.removeClass('typing');
+			this.el.find('.main').removeClass('hasBorderShadow');
 
 			let textbox = this.find('input');
 
 			if (show) {
 				this.el.addClass('typing');
+				this.el.find('.main').addClass('hasBorderShadow');
 
 				if (!config.rememberChatChannel) {
 					this.currentChannel = 'global';

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

@@ -222,7 +222,6 @@
 	}
 
 	&.typing {
-		box-shadow: 0 -2px 0 @black, 0 2px 0 @black, 2px 0 0 @black, -2px 0 0 @black;
 		pointer-events: all;
 
 		.filters {

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

@@ -1,20 +1,22 @@
 <div class="uiMessages active">
 	<div class="filters">
-		<div class="btn filter active" filter="info">info</div>
-		<div class="btn filter active" filter="rep">reputation</div>
-		<div class="btn filter active" filter="chat">players</div>
-		<div class="btn filter active" filter="loot">loot</div>
+		<div class="btn filter active hasBorderShadow" filter="info">info</div>
+		<div class="btn filter active hasBorderShadow" filter="rep">reputation</div>
+		<div class="btn filter active hasBorderShadow" filter="chat">players</div>
+		<div class="btn filter active hasBorderShadow" filter="loot">loot</div>
 	</div>
-	<div class="list rep chat info loot"></div>
-	<div class="bottom">
-		<div class="channelPicker"></div>
-		<input type="text" class="el textbox message">
-		<div class="input el textbox message"></div>
-	</div>
-	<div class="bottom time"></div>
-	<div class="bottom channelOptions">
-		<div class="option">global</div>
-		<div class="option">party</div>
-		<div class="option">direct</div>
+	<div class="main">
+		<div class="list rep chat info loot"></div>
+		<div class="bottom">
+			<div class="channelPicker"></div>
+			<input type="text" class="el textbox message">
+			<div class="input el textbox message"></div>
+		</div>
+		<div class="bottom time"></div>
+		<div class="bottom channelOptions">
+			<div class="option">global</div>
+			<div class="option">party</div>
+			<div class="option">direct</div>
+		</div>
 	</div>
 </div>

src/client/ui/templates/messages/tplTab.html

@@ -1 +1 @@
-<div class="filter active" filter="filterName"></div>
+<div class="filter active hasBorderShadow" filter="filterName"></div>

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

@@ -7,7 +7,6 @@
 	right: 10px;
 	top: 10px;
 	height: (@btnSize + @pad);
-	box-shadow: 0 -2px 0 @black, 0 2px 0 @black, 2px 0 0 @black, -2px 0 0 @black;
 
 	.spell {
 		width: @btnSize;

src/client/ui/templates/spells/templateSpell.html

@@ -1,4 +1,4 @@
-<div class="spell">
+<div class="spell hasBorderShadow">
 	<div class="icon"></div>
 	<div class="hotkey">$HOTKEY$</div>
 	<div class="cooldown"></div>

src/server/components/stats.js

@@ -436,7 +436,9 @@ module.exports = {
 				obj.effects.die();
 			if (this.obj.spellbook)
 				this.obj.spellbook.die();
+
 			obj.destroyed = true;
+			obj.destructionEvent = 'death';
 
 			let deathAnimation = _.getDeepProperty(animations, ['mobs', obj.sheetName, obj.cell, 'death']);
 			if (deathAnimation) {

src/server/world/syncer.js

@@ -59,7 +59,7 @@ module.exports = {
 				continue;
 
 			let destroyed = o.destroyed;
-			
+
 			let sync = null;
 			let syncSelf = null;
 			if (!destroyed) {
@@ -69,7 +69,8 @@ module.exports = {
 			} else {
 				sync = {
 					id: o.id,
-					destroyed: true
+					destroyed: true,
+					destructionEvent: o.destructionEvent
 				};
 
 				objects.removeObject(o);
@@ -112,8 +113,14 @@ module.exports = {
 					}
 
 					if (destroyed || !canSee) {
-						if (!canSee)
-							queueFunction({ id: oId, destroyed: true }, [ p.serverId ]);
+						if (!canSee) {
+							queueFunction({
+								id: oId,
+								destroyed: true,
+								destructionEvent: 'visibility'
+							},
+							[ p.serverId ]);
+						}
 
 						p.player.unsee(oId);
 					}