krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 07:07:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Client sept 12 (#9032)

Browse Source 
* Removed load all members from challengs

* Fixed chalenge member modal loading

* Fixed party setting

* Fixed chat showing

* Fixed armoire drops

* Ignored lint issue

* Fixed buying old armoir items

* Fixed hatching

* Fixed pending damage
This commit is contained in:
Keith Holliday
2017-09-12 12:56:06 -05:00
committed by GitHub
parent 0c6540e6d8
commit e29c393629
9 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
website/client/components/groups/group.vue
View File

@@ -109,7 +109,8 @@
span.float-left
| {{parseFloat(group.quest.progress.hp).toFixed(2)}} / {{parseFloat(questData.boss.hp).toFixed(2)}}
.col-6
span.float-right {{group.quest.progress.up || 0}} pending damage
// @TODO: Why do we not sync quset progress on the group doc? Each user could have different progress
span.float-right {{user.party.quest.progress.up || 0}} pending damage
.row.rage-bar-row(v-if='questData.boss.rage')
.col-12
.grey-progress-bar
@@ -684,8 +685,8 @@ export default {
let group = await this.$store.dispatch('guilds:getGroup', {groupId: this.searchId});
if (this.isParty) {
this.$store.party = group;
this.group = this.$store.party;
this.$store.state.party.data = group;
this.group = this.$store.state.party.data;
this.checkForAchievements();
return;
}