From 0b17e0e1a1fae5bea6d2bfbadc3728c65786a6f1 Mon Sep 17 00:00:00 2001 From: kckckc Date: Sat, 16 Apr 2022 23:27:59 -0700 Subject: [PATCH 1/8] Separate chat and chat filters border shadow --- src/client/ui/templates/messages/styles.less | 9 ++++++- .../ui/templates/messages/template.html | 24 ++++++++++--------- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/client/ui/templates/messages/styles.less b/src/client/ui/templates/messages/styles.less index e3062111..435b0672 100644 --- a/src/client/ui/templates/messages/styles.less +++ b/src/client/ui/templates/messages/styles.less @@ -222,12 +222,19 @@ } &.typing { - box-shadow: 0 -2px 0 @black, 0 2px 0 @black, 2px 0 0 @black, -2px 0 0 @black; pointer-events: all; .filters { pointer-events: all; display: flex; + + .filter { + box-shadow: 0 -2px 0 @black, 0 2px 0 @black, 2px 0 0 @black, -2px 0 0 @black; + } + } + + .main { + box-shadow: 0 -2px 0 @black, 0 2px 0 @black, 2px 0 0 @black, -2px 0 0 @black; } .list { diff --git a/src/client/ui/templates/messages/template.html b/src/client/ui/templates/messages/template.html index 566ee2f3..5be45136 100644 --- a/src/client/ui/templates/messages/template.html +++ b/src/client/ui/templates/messages/template.html @@ -5,16 +5,18 @@
players
loot
-
-
-
- -
-
-
-
-
global
-
party
-
direct
+
+
+
+
+ +
+
+
+
+
global
+
party
+
direct
+
From cb9fe8e46485d36161f97c2624184208eedb439f Mon Sep 17 00:00:00 2001 From: kckckc Date: Tue, 19 Apr 2022 13:27:20 -0700 Subject: [PATCH 2/8] Closes #1922 --- src/client/ui/templates/spells/styles.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/ui/templates/spells/styles.less b/src/client/ui/templates/spells/styles.less index a6cc44fe..9c59ab45 100644 --- a/src/client/ui/templates/spells/styles.less +++ b/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; @@ -21,6 +20,7 @@ border: 5px solid fade(#3a3b4a, 90%); transition-property: filter; transition-duration: 0.1s; + box-shadow: 0 -2px 0 @black, 0 2px 0 @black, 2px 0 0 @black, -2px 0 0 @black; &:first-child { margin-left: 0px; From a338a5129e8d4a72af2b55c66f46b0d14d379c57 Mon Sep 17 00:00:00 2001 From: kckckc Date: Tue, 19 Apr 2022 13:44:47 -0700 Subject: [PATCH 3/8] Indicate if objects were destroyed by death or by visibility --- src/server/components/stats.js | 2 ++ src/server/world/syncer.js | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/server/components/stats.js b/src/server/components/stats.js index 1b094f5f..f6d32750 100644 --- a/src/server/components/stats.js +++ b/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.destroyedBy = 'death'; let deathAnimation = _.getDeepProperty(animations, ['mobs', obj.sheetName, obj.cell, 'death']); if (deathAnimation) { diff --git a/src/server/world/syncer.js b/src/server/world/syncer.js index ea582a3b..a5bf277e 100644 --- a/src/server/world/syncer.js +++ b/src/server/world/syncer.js @@ -59,7 +59,8 @@ module.exports = { continue; let destroyed = o.destroyed; - + let destroyedBy = o.destroyedBy; + let sync = null; let syncSelf = null; if (!destroyed) { @@ -69,7 +70,8 @@ module.exports = { } else { sync = { id: o.id, - destroyed: true + destroyed: true, + destroyedBy }; objects.removeObject(o); From 714263289b786832a47a049435cf767982c59761 Mon Sep 17 00:00:00 2001 From: kckckc Date: Tue, 19 Apr 2022 19:23:47 -0700 Subject: [PATCH 4/8] Add new labels, remove mention of BreadSlice assigning weights, add missing word --- CONTRIBUTING.md | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a2a93232..8a294c75 100644 --- a/CONTRIBUTING.md +++ b/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)) \ No newline at end of file +* [MacOS](https://gitlab.com/Isleward/isleward/wikis/installation-and-usage-(macos)) From 09ebcd4e9cfd2358bd44921f7cb74e2d092846a7 Mon Sep 17 00:00:00 2001 From: kckckc Date: Wed, 20 Apr 2022 00:35:05 -0700 Subject: [PATCH 5/8] Remove unnecessary variable --- src/server/world/syncer.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/server/world/syncer.js b/src/server/world/syncer.js index a5bf277e..1160aed5 100644 --- a/src/server/world/syncer.js +++ b/src/server/world/syncer.js @@ -59,7 +59,6 @@ module.exports = { continue; let destroyed = o.destroyed; - let destroyedBy = o.destroyedBy; let sync = null; let syncSelf = null; @@ -71,7 +70,7 @@ module.exports = { sync = { id: o.id, destroyed: true, - destroyedBy + destroyedBy: o.destroyedBy }; objects.removeObject(o); From 250a35a29432ff9d862d4888ef6ce6c6f8fb2562 Mon Sep 17 00:00:00 2001 From: kckckc Date: Wed, 20 Apr 2022 00:51:54 -0700 Subject: [PATCH 6/8] Use hasBorderShadow class --- src/client/ui/templates/messages/messages.js | 2 ++ src/client/ui/templates/messages/styles.less | 8 -------- src/client/ui/templates/messages/template.html | 8 ++++---- src/client/ui/templates/messages/tplTab.html | 2 +- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/client/ui/templates/messages/messages.js b/src/client/ui/templates/messages/messages.js index 4b88ac2c..bf43ecf8 100644 --- a/src/client/ui/templates/messages/messages.js +++ b/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'; diff --git a/src/client/ui/templates/messages/styles.less b/src/client/ui/templates/messages/styles.less index 435b0672..6334ab13 100644 --- a/src/client/ui/templates/messages/styles.less +++ b/src/client/ui/templates/messages/styles.less @@ -227,14 +227,6 @@ .filters { pointer-events: all; display: flex; - - .filter { - box-shadow: 0 -2px 0 @black, 0 2px 0 @black, 2px 0 0 @black, -2px 0 0 @black; - } - } - - .main { - box-shadow: 0 -2px 0 @black, 0 2px 0 @black, 2px 0 0 @black, -2px 0 0 @black; } .list { diff --git a/src/client/ui/templates/messages/template.html b/src/client/ui/templates/messages/template.html index 5be45136..b64d0ce2 100644 --- a/src/client/ui/templates/messages/template.html +++ b/src/client/ui/templates/messages/template.html @@ -1,9 +1,9 @@
-
info
-
reputation
-
players
-
loot
+
info
+
reputation
+
players
+
loot
diff --git a/src/client/ui/templates/messages/tplTab.html b/src/client/ui/templates/messages/tplTab.html index 606fff75..5c74e14a 100644 --- a/src/client/ui/templates/messages/tplTab.html +++ b/src/client/ui/templates/messages/tplTab.html @@ -1 +1 @@ -
\ No newline at end of file +
\ No newline at end of file From cdc6a255b1f66010f3cfccfe15d59e6d5d9a92f8 Mon Sep 17 00:00:00 2001 From: kckckc Date: Wed, 20 Apr 2022 00:57:00 -0700 Subject: [PATCH 7/8] Use hasBorderShadow class for spells --- src/client/ui/templates/spells/styles.less | 1 - src/client/ui/templates/spells/templateSpell.html | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/client/ui/templates/spells/styles.less b/src/client/ui/templates/spells/styles.less index 9c59ab45..2d757538 100644 --- a/src/client/ui/templates/spells/styles.less +++ b/src/client/ui/templates/spells/styles.less @@ -20,7 +20,6 @@ border: 5px solid fade(#3a3b4a, 90%); transition-property: filter; transition-duration: 0.1s; - box-shadow: 0 -2px 0 @black, 0 2px 0 @black, 2px 0 0 @black, -2px 0 0 @black; &:first-child { margin-left: 0px; diff --git a/src/client/ui/templates/spells/templateSpell.html b/src/client/ui/templates/spells/templateSpell.html index b565f9f9..386c44b7 100644 --- a/src/client/ui/templates/spells/templateSpell.html +++ b/src/client/ui/templates/spells/templateSpell.html @@ -1,4 +1,4 @@ -
+
$HOTKEY$
From 677522eb81193dfdf1b6a06ca2b331ac7a54a242 Mon Sep 17 00:00:00 2001 From: kckckc Date: Wed, 20 Apr 2022 01:18:53 -0700 Subject: [PATCH 8/8] Rename destroyedBy & send visibility destroy event --- src/server/components/stats.js | 2 +- src/server/world/syncer.js | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/server/components/stats.js b/src/server/components/stats.js index f6d32750..c5d589c7 100644 --- a/src/server/components/stats.js +++ b/src/server/components/stats.js @@ -438,7 +438,7 @@ module.exports = { this.obj.spellbook.die(); obj.destroyed = true; - obj.destroyedBy = 'death'; + obj.destructionEvent = 'death'; let deathAnimation = _.getDeepProperty(animations, ['mobs', obj.sheetName, obj.cell, 'death']); if (deathAnimation) { diff --git a/src/server/world/syncer.js b/src/server/world/syncer.js index 1160aed5..79ab5777 100644 --- a/src/server/world/syncer.js +++ b/src/server/world/syncer.js @@ -70,7 +70,7 @@ module.exports = { sync = { id: o.id, destroyed: true, - destroyedBy: o.destroyedBy + destructionEvent: o.destructionEvent }; objects.removeObject(o); @@ -113,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); }