From 9de6f7b3bc7317fe03ba92ee467e8d40c5ac8625 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Fri, 6 May 2022 17:26:48 -0500 Subject: [PATCH 1/7] fix(Docker): include failsafe for Git HTTPS --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 7912f92802..1c15f1e862 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN npm install -g gulp-cli mocha RUN mkdir -p /usr/src/habitrpg WORKDIR /usr/src/habitrpg RUN git clone --branch release --depth 1 https://github.com/HabitRPG/habitica.git /usr/src/habitrpg +RUN git config --global url."https://".insteadOf git:// RUN npm set unsafe-perm true RUN npm install From a1d04037820b4538b6c95c535b88c39acf8dca78 Mon Sep 17 00:00:00 2001 From: Alys Date: Sun, 8 May 2022 17:45:15 +1000 Subject: [PATCH 2/7] fix bug in hasPermissions call to stop normal users seeing UserID column --- website/client/src/components/hall/heroes.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/client/src/components/hall/heroes.vue b/website/client/src/components/hall/heroes.vue index ad2d93f442..28b4cfc7f2 100644 --- a/website/client/src/components/hall/heroes.vue +++ b/website/client/src/components/hall/heroes.vue @@ -274,7 +274,7 @@ /> From 2a4886b325f3c26e53789df9a1960a086577a46e Mon Sep 17 00:00:00 2001 From: Alys Date: Sun, 8 May 2022 20:20:53 +1000 Subject: [PATCH 3/7] merge User ID column into Name column in Hall of Heroes --- website/client/src/components/hall/heroes.vue | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/website/client/src/components/hall/heroes.vue b/website/client/src/components/hall/heroes.vue index 28b4cfc7f2..9c1e02dc37 100644 --- a/website/client/src/components/hall/heroes.vue +++ b/website/client/src/components/hall/heroes.vue @@ -247,9 +247,6 @@ {{ $t('name') }} - - {{ $t('userId') }} - {{ $t('contribLevel') }} {{ $t('title') }} {{ $t('contributions') }} @@ -272,18 +269,17 @@ v-else :user="hero" /> - - - + +
{{ hero._id }} - +
+ + admin panel + + {{ hero.contributor.level }} {{ hero.contributor.text }} From 7548834442755667e5f0f477192c456f4ecc8d9a Mon Sep 17 00:00:00 2001 From: CuriousMagpie Date: Thu, 5 May 2022 13:43:37 -0400 Subject: [PATCH 4/7] 2022-05 backgrounds and enchanted armoire images --- habitica-images | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/habitica-images b/habitica-images index 05c7c19fa5..08edadc432 160000 --- a/habitica-images +++ b/habitica-images @@ -1 +1 @@ -Subproject commit 05c7c19fa56195bf722318196f821ada35c901cd +Subproject commit 08edadc432ca5b7d291f42f7c6c49faa1d9bfc30 From beb51fb00d2d002a22fa99bafb1ec0d4fd432822 Mon Sep 17 00:00:00 2001 From: CuriousMagpie Date: Thu, 5 May 2022 14:29:13 -0400 Subject: [PATCH 5/7] 2022-05 backgrounds and enchanted --- website/common/locales/en/backgrounds.json | 9 +++++++++ website/common/locales/en/gear.json | 6 ++++++ .../script/content/appearance/backgrounds.js | 5 +++++ .../common/script/content/gear/sets/armoire.js | 15 +++++++++++++++ 4 files changed, 35 insertions(+) diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json index 8a4981682d..7ca498733f 100644 --- a/website/common/locales/en/backgrounds.json +++ b/website/common/locales/en/backgrounds.json @@ -779,6 +779,15 @@ "backgroundSpringtimeLakeText": "Springtime Lake", "backgroundSpringtimeLakeNotes": "Take in the sights along the shores of a Springtime Lake.", + "backgrounds052022": "SET 96: Released May 2022", + "backgroundOnACastleWallText": "On A Castle Wall", + "backgroundOnACastleWallNotes": "Look out from on a castle wall.", + "backgroundCastleGateText": "Castle Gate", + "backgroundCastleGateNotes": "Stand guard at the castle gate.", + "backgroundEnchantedMusicRoomText": "Enchanted Music Room", + "backgroundEnchantedMusicRoomNotes": "Play in an enchated music room.", + + "timeTravelBackgrounds": "Steampunk Backgrounds", "backgroundAirshipText": "Airship", "backgroundAirshipNotes": "Become a sky sailor on board your very own Airship.", diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json index 2f134f7738..0210bea031 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -628,6 +628,8 @@ "weaponArmoirePinkLongbowNotes": "Be a cupid-in-training, mastering both archery and matters of the heart with this beautiful bow. Increases Perception by <%= per %> and Strength by <%= str %>. Enchanted Armoire: Independent Item.", "weaponArmoireGardenersWateringCanText": "Watering Can", "weaponArmoireGardenersWateringCanNotes": "You can’t get far without water! Have an infinite supply on hand with this magic, refilling watering can. Increases Intelligence by <%= int %>. Enchanted Armoire: Gardener Set (Item 4 of 4).", + "weaponArmoireHuntingHornText": "Hunting Horn", + "weaponArmoireHuntingHornNotes": "Twooooo! Twoo! Twoo! Gather your party for an adventure or quest by playing this horn. Increases strength by <%= str %> and intelligence by <%= int %>. Enchanted Armoire: Musical Instrument Set 1 (Item 1 of 3)", "armor": "armor", "armorCapitalized": "Armor", @@ -2426,6 +2428,10 @@ "shieldArmoireSoftVioletPillowNotes": "The clever warrior packs a pillow for any expedition. Protect yourself from procrastination-induced panic... even while you nap. Increases Intelligence by <%= int %>. Enchanted Armoire: Violet Loungewear Set (Item 3 of 3).", "shieldArmoireGardenersSpadeText": "Gardener's Spade", "shieldArmoireGardenersSpadeNotes": "Whether you’re digging in the garden, searching for buried treasure, or creating a secret tunnel, this trusty spade is at your side. Increases Strength by <%= str %>. Enchanted Armoire: Gardener Set (Item 3 of 4).", + "shieldArmoireSpanishGuitarText": "Spanish Guitar", + "shieldArmoireSpanishGuitarNotes": "Tink! Tink! Thrummm! Gather your party for a concert or celebration by playing this guitar. Increases perception by <%= per %> and intelligence by <%= int %>. Enchanted Armoire: Musical Instrument Set 1 (Item 2 of 3)", + "shieldArmoireSnareDrumText": "Snare Drum", + "shieldArmoireSnareDrumNotes": "Rat-a-tat-tat! Gather your party for a parade or march into battle by playing this drum. Increases constitution by <%= con %> and intelligence by <%= int %>. Enchanted Armoire: Musical Instrument Set 1 (Item 3 of 3)", "back": "Back Accessory", "backBase0Text": "No Back Accessory", diff --git a/website/common/script/content/appearance/backgrounds.js b/website/common/script/content/appearance/backgrounds.js index a7bb2d582e..20ac40b4b6 100644 --- a/website/common/script/content/appearance/backgrounds.js +++ b/website/common/script/content/appearance/backgrounds.js @@ -495,6 +495,11 @@ const backgrounds = { flower_shop: { }, springtime_lake: { }, }, + backgrounds052022: { + on_a_castle_wall: { }, + enchanted_music_room: { }, + castle_gate: { }, + }, timeTravelBackgrounds: { airship: { price: 1, diff --git a/website/common/script/content/gear/sets/armoire.js b/website/common/script/content/gear/sets/armoire.js index 8a94df1d62..08a92cf612 100644 --- a/website/common/script/content/gear/sets/armoire.js +++ b/website/common/script/content/gear/sets/armoire.js @@ -1076,6 +1076,16 @@ const shield = { str: 8, set: 'gardenerSet', }, + spanishGuitar: { + per: 5, // this might need to go back to 6 + int: 6, + set: 'musicalInstrumentOne', + }, + snareDrum: { + con: 5, + int: 6, + set: 'musicalInstrumentOne', + }, }; const headAccessory = { @@ -1460,6 +1470,11 @@ const weapon = { int: 8, set: 'gardenerSet', }, + huntingHorn: { + str: 5, + int: 6, + set: 'musicalInstrumentOne', + }, }; forEach({ From 8e1bc6bcd73c37bcea8ce082cc0188595ae749a8 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Mon, 9 May 2022 14:21:02 -0500 Subject: [PATCH 6/7] chore(sprites): compile also fix a few string typos --- .../assets/css/sprites/spritesmith-main.css | 60 +++++++++++++++++++ website/common/locales/en/backgrounds.json | 7 +-- website/common/locales/en/gear.json | 6 +- 3 files changed, 66 insertions(+), 7 deletions(-) diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css index 63a9de9cf9..6df4021598 100644 --- a/website/client/src/assets/css/sprites/spritesmith-main.css +++ b/website/client/src/assets/css/sprites/spritesmith-main.css @@ -675,6 +675,11 @@ width: 141px; height: 147px; } +.background_castle_gate { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_castle_gate.png'); + width: 141px; + height: 147px; +} .background_champions_colosseum { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_champions_colosseum.png'); width: 141px; @@ -860,6 +865,11 @@ width: 141px; height: 147px; } +.background_enchanted_music_room { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_enchanted_music_room.png'); + width: 141px; + height: 147px; +} .background_fairy_ring { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_fairy_ring.png'); width: 141px; @@ -1389,6 +1399,11 @@ width: 141px; height: 147px; } +.background_on_a_castle_wall { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_on_a_castle_wall.png'); + width: 141px; + height: 147px; +} .background_on_tree_branch { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_on_tree_branch.png'); width: 141px; @@ -2171,6 +2186,11 @@ width: 68px; height: 68px; } +.icon_background_castle_gate { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_castle_gate.png'); + width: 68px; + height: 68px; +} .icon_background_champions_colosseum { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_champions_colosseum.png'); width: 68px; @@ -2361,6 +2381,11 @@ width: 68px; height: 68px; } +.icon_background_enchanted_music_room { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_enchanted_music_room.png'); + width: 68px; + height: 68px; +} .icon_background_fairy_ring { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_fairy_ring.png'); width: 68px; @@ -2890,6 +2915,11 @@ width: 68px; height: 68px; } +.icon_background_on_a_castle_wall { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_on_a_castle_wall.png'); + width: 68px; + height: 68px; +} .icon_background_on_tree_branch { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_on_tree_branch.png'); width: 68px; @@ -19055,6 +19085,11 @@ width: 114px; height: 90px; } +.shield_armoire_snareDrum { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_snareDrum.png'); + width: 114px; + height: 90px; +} .shield_armoire_softBlackPillow { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_softBlackPillow.png'); width: 114px; @@ -19085,6 +19120,11 @@ width: 114px; height: 90px; } +.shield_armoire_spanishGuitar { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_spanishGuitar.png'); + width: 114px; + height: 90px; +} .shield_armoire_strawberryFood { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_strawberryFood.png'); width: 90px; @@ -20240,6 +20280,11 @@ width: 68px; height: 68px; } +.shop_shield_armoire_snareDrum { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_armoire_snareDrum.png'); + width: 68px; + height: 68px; +} .shop_shield_armoire_softBlackPillow { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_armoire_softBlackPillow.png'); width: 68px; @@ -20270,6 +20315,11 @@ width: 68px; height: 68px; } +.shop_shield_armoire_spanishGuitar { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_armoire_spanishGuitar.png'); + width: 68px; + height: 68px; +} .shop_shield_armoire_strawberryFood { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_armoire_strawberryFood.png'); width: 68px; @@ -20485,6 +20535,11 @@ width: 68px; height: 68px; } +.shop_weapon_armoire_huntingHorn { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_armoire_huntingHorn.png'); + width: 68px; + height: 68px; +} .shop_weapon_armoire_ironCrook { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_armoire_ironCrook.png'); width: 68px; @@ -21315,6 +21370,11 @@ width: 90px; height: 90px; } +.weapon_armoire_huntingHorn { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_huntingHorn.png'); + width: 114px; + height: 90px; +} .weapon_armoire_ironCrook { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_ironCrook.png'); width: 90px; diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json index 7ca498733f..8218926222 100644 --- a/website/common/locales/en/backgrounds.json +++ b/website/common/locales/en/backgrounds.json @@ -781,12 +781,11 @@ "backgrounds052022": "SET 96: Released May 2022", "backgroundOnACastleWallText": "On A Castle Wall", - "backgroundOnACastleWallNotes": "Look out from on a castle wall.", + "backgroundOnACastleWallNotes": "Look out from On a Castle Wall.", "backgroundCastleGateText": "Castle Gate", - "backgroundCastleGateNotes": "Stand guard at the castle gate.", + "backgroundCastleGateNotes": "Stand guard at the Castle Gate.", "backgroundEnchantedMusicRoomText": "Enchanted Music Room", - "backgroundEnchantedMusicRoomNotes": "Play in an enchated music room.", - + "backgroundEnchantedMusicRoomNotes": "Play in an Enchanted Music Room.", "timeTravelBackgrounds": "Steampunk Backgrounds", "backgroundAirshipText": "Airship", diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json index 0210bea031..421ca19159 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -629,7 +629,7 @@ "weaponArmoireGardenersWateringCanText": "Watering Can", "weaponArmoireGardenersWateringCanNotes": "You can’t get far without water! Have an infinite supply on hand with this magic, refilling watering can. Increases Intelligence by <%= int %>. Enchanted Armoire: Gardener Set (Item 4 of 4).", "weaponArmoireHuntingHornText": "Hunting Horn", - "weaponArmoireHuntingHornNotes": "Twooooo! Twoo! Twoo! Gather your party for an adventure or quest by playing this horn. Increases strength by <%= str %> and intelligence by <%= int %>. Enchanted Armoire: Musical Instrument Set 1 (Item 1 of 3)", + "weaponArmoireHuntingHornNotes": "Twooooo! Twoo! Twoo! Gather your party for an adventure or quest by playing this horn. Increases Strength by <%= str %> and Intelligence by <%= int %>. Enchanted Armoire: Musical Instrument Set 1 (Item 1 of 3)", "armor": "armor", "armorCapitalized": "Armor", @@ -2429,9 +2429,9 @@ "shieldArmoireGardenersSpadeText": "Gardener's Spade", "shieldArmoireGardenersSpadeNotes": "Whether you’re digging in the garden, searching for buried treasure, or creating a secret tunnel, this trusty spade is at your side. Increases Strength by <%= str %>. Enchanted Armoire: Gardener Set (Item 3 of 4).", "shieldArmoireSpanishGuitarText": "Spanish Guitar", - "shieldArmoireSpanishGuitarNotes": "Tink! Tink! Thrummm! Gather your party for a concert or celebration by playing this guitar. Increases perception by <%= per %> and intelligence by <%= int %>. Enchanted Armoire: Musical Instrument Set 1 (Item 2 of 3)", + "shieldArmoireSpanishGuitarNotes": "Tink! Tink! Thrummm! Gather your party for a concert or celebration by playing this guitar. Increases Perception by <%= per %> and Intelligence by <%= int %>. Enchanted Armoire: Musical Instrument Set 1 (Item 2 of 3)", "shieldArmoireSnareDrumText": "Snare Drum", - "shieldArmoireSnareDrumNotes": "Rat-a-tat-tat! Gather your party for a parade or march into battle by playing this drum. Increases constitution by <%= con %> and intelligence by <%= int %>. Enchanted Armoire: Musical Instrument Set 1 (Item 3 of 3)", + "shieldArmoireSnareDrumNotes": "Rat-a-tat-tat! Gather your party for a parade or march into battle by playing this drum. Increases Constitution by <%= con %> and Intelligence by <%= int %>. Enchanted Armoire: Musical Instrument Set 1 (Item 3 of 3)", "back": "Back Accessory", "backBase0Text": "No Back Accessory", From 0a22038d05c13764cab2f8daa9bc6ca8e5ef90b4 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Tue, 10 May 2022 13:56:00 -0500 Subject: [PATCH 7/7] 4.230.0 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1b1b0d9c0e..73aab90b68 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.229.2", + "version": "4.230.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 68ef3ad048..9ac0890850 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "habitica", "description": "A habit tracker app which treats your goals like a Role Playing Game.", - "version": "4.229.2", + "version": "4.230.0", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.17.10",