Skip to content
Permalink
Browse files

Merge branch 'release' into develop

  • Loading branch information
SabreCat committed Aug 6, 2019
2 parents 07ae413 + a8c93d9 commit e2385bd1fdeb0b39df00e59eac3d5eaff4931f16
Showing with 10,899 additions and 10,743 deletions.
  1. +1 −1 package-lock.json
  2. +1 −1 package.json
  3. +1 −1 scripts/gdpr-delete-users.js
  4. +8 −2 website/client/assets/css/sprites/spritesmith-largeSprites-0.css
  5. +132 −132 website/client/assets/css/sprites/spritesmith-main-0.css
  6. +370 −442 website/client/assets/css/sprites/spritesmith-main-1.css
  7. +484 −442 website/client/assets/css/sprites/spritesmith-main-10.css
  8. +463 −349 website/client/assets/css/sprites/spritesmith-main-11.css
  9. +81 −81 website/client/assets/css/sprites/spritesmith-main-12.css
  10. +409 −475 website/client/assets/css/sprites/spritesmith-main-13.css
  11. +317 −317 website/client/assets/css/sprites/spritesmith-main-14.css
  12. +301 −301 website/client/assets/css/sprites/spritesmith-main-15.css
  13. +272 −266 website/client/assets/css/sprites/spritesmith-main-16.css
  14. +312 −324 website/client/assets/css/sprites/spritesmith-main-17.css
  15. +304 −304 website/client/assets/css/sprites/spritesmith-main-18.css
  16. +320 −290 website/client/assets/css/sprites/spritesmith-main-19.css
  17. +787 −787 website/client/assets/css/sprites/spritesmith-main-2.css
  18. +315 −387 website/client/assets/css/sprites/spritesmith-main-20.css
  19. +352 −352 website/client/assets/css/sprites/spritesmith-main-21.css
  20. +468 −468 website/client/assets/css/sprites/spritesmith-main-22.css
  21. +337 −337 website/client/assets/css/sprites/spritesmith-main-23.css
  22. +380 −380 website/client/assets/css/sprites/spritesmith-main-24.css
  23. +325 −187 website/client/assets/css/sprites/spritesmith-main-25.css
  24. +678 −678 website/client/assets/css/sprites/spritesmith-main-3.css
  25. +843 −843 website/client/assets/css/sprites/spritesmith-main-4.css
  26. +704 −644 website/client/assets/css/sprites/spritesmith-main-5.css
  27. +468 −462 website/client/assets/css/sprites/spritesmith-main-6.css
  28. +446 −488 website/client/assets/css/sprites/spritesmith-main-7.css
  29. +497 −479 website/client/assets/css/sprites/spritesmith-main-8.css
  30. +447 −507 website/client/assets/css/sprites/spritesmith-main-9.css
  31. BIN website/client/assets/images/sprites/spritesmith-largeSprites-0.png
  32. BIN website/client/assets/images/sprites/spritesmith-main-0.png
  33. BIN website/client/assets/images/sprites/spritesmith-main-1.png
  34. BIN website/client/assets/images/sprites/spritesmith-main-10.png
  35. BIN website/client/assets/images/sprites/spritesmith-main-11.png
  36. BIN website/client/assets/images/sprites/spritesmith-main-12.png
  37. BIN website/client/assets/images/sprites/spritesmith-main-13.png
  38. BIN website/client/assets/images/sprites/spritesmith-main-14.png
  39. BIN website/client/assets/images/sprites/spritesmith-main-15.png
  40. BIN website/client/assets/images/sprites/spritesmith-main-16.png
  41. BIN website/client/assets/images/sprites/spritesmith-main-17.png
  42. BIN website/client/assets/images/sprites/spritesmith-main-18.png
  43. BIN website/client/assets/images/sprites/spritesmith-main-19.png
  44. BIN website/client/assets/images/sprites/spritesmith-main-2.png
  45. BIN website/client/assets/images/sprites/spritesmith-main-20.png
  46. BIN website/client/assets/images/sprites/spritesmith-main-21.png
  47. BIN website/client/assets/images/sprites/spritesmith-main-22.png
  48. BIN website/client/assets/images/sprites/spritesmith-main-23.png
  49. BIN website/client/assets/images/sprites/spritesmith-main-24.png
  50. BIN website/client/assets/images/sprites/spritesmith-main-25.png
  51. BIN website/client/assets/images/sprites/spritesmith-main-3.png
  52. BIN website/client/assets/images/sprites/spritesmith-main-4.png
  53. BIN website/client/assets/images/sprites/spritesmith-main-5.png
  54. BIN website/client/assets/images/sprites/spritesmith-main-6.png
  55. BIN website/client/assets/images/sprites/spritesmith-main-7.png
  56. BIN website/client/assets/images/sprites/spritesmith-main-8.png
  57. BIN website/client/assets/images/sprites/spritesmith-main-9.png
  58. +9 −1 website/common/locales/en/backgrounds.json
  59. +9 −1 website/common/locales/en/gear.json
  60. +14 −0 website/common/script/content/appearance/backgrounds.js
  61. +33 −0 website/common/script/content/gear/sets/armoire.js
  62. BIN website/raw_sprites/spritesmith/backgrounds/background_amid_ancient_ruins.png
  63. BIN website/raw_sprites/spritesmith/backgrounds/background_giant_dandelions.png
  64. BIN website/raw_sprites/spritesmith/backgrounds/background_treehouse.png
  65. BIN website/raw_sprites/spritesmith/backgrounds/icons/icon_background_amid_ancient_ruins.png
  66. BIN website/raw_sprites/spritesmith/backgrounds/icons/icon_background_giant_dandelions.png
  67. BIN website/raw_sprites/spritesmith/backgrounds/icons/icon_background_treehouse.png
  68. BIN website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_invernessCape.png
  69. BIN website/raw_sprites/spritesmith/gear/armoire/head_armoire_deerstalkerCap.png
  70. BIN website/raw_sprites/spritesmith/gear/armoire/shield_armoire_trustyUmbrella.png
  71. BIN website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_invernessCape.png
  72. BIN website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_deerstalkerCap.png
  73. BIN website/raw_sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_trustyUmbrella.png
  74. BIN website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_magnifyingGlass.png
  75. BIN website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_invernessCape.png
  76. BIN website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_magnifyingGlass.png
  77. BIN website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201907.png
  78. BIN website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201908.png
  79. BIN website/raw_sprites/spritesmith_large/scene_reading.png
  80. +11 −14 website/server/controllers/api-v3/news.js

Some generated files are not rendered by default. Learn more.

@@ -1,7 +1,7 @@
{
"name": "habitica",
"description": "A habit tracker app which treats your goals like a Role Playing Game.",
"version": "4.105.4",
"version": "4.106.0",
"main": "./website/server/index.js",
"dependencies": {
"@google-cloud/trace-agent": "^4.0.0",
@@ -58,7 +58,7 @@ async function _deleteHabiticaData (user, email) {
}

async function _processEmailAddress (email) {
const emailRegex = new RegExp(`^${email}`, 'i');
const emailRegex = new RegExp(`^${email}$`, 'i');
const users = await User.find({
$or: [
{'auth.local.email': emailRegex},
@@ -1,4 +1,4 @@
.promo_armoire_backgrounds_201907 {
.promo_armoire_backgrounds_201908 {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: 0px 0px;
width: 423px;
@@ -18,10 +18,16 @@
}
.promo_take_this {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -424px -145px;
background-position: -596px -145px;
width: 96px;
height: 69px;
}
.scene_reading {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -424px -145px;
width: 171px;
height: 144px;
}
.scene_rewards {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: 0px -311px;

0 comments on commit e2385bd

Please sign in to comment.
You can’t perform that action at this time.