b2100c2c54
WIP(greeting-cards): Abandon spell refactor
2015-08-13 14:31:34 -05:00
ceb9cf7817
WIP(event): Habitica Day
2015-07-28 16:20:08 -05:00
13ab60cafe
feat(drops): Enable pets at Level 3
2015-07-28 13:28:45 -05:00
f40cfd2b66
Move all pet counting to shared count scripts
2015-07-22 17:32:12 -05:00
65c14b1e3f
Refactor inventory ctrl variables
2015-07-20 12:51:10 -05:00
3d40da4004
Remove countPets and countMounts from codebase
2015-07-20 08:11:00 -05:00
cb9f5bcff3
Merge pull request #5523 from hairlessbear/update_isOnQuest_logic
...
Removed user.party.quest.key checks from isOnQuest and added check for user ID in quest members
2015-07-14 08:11:35 +10:00
9bcb3b5cbe
update model maxHealth
2015-07-03 22:22:28 -07:00
d4b5620ada
Merge branch 'sabrecat/summer-splash' into develop
2015-07-01 13:13:23 -05:00
25dd82ffa0
feat(event): Summer Splash cont'd
...
Summer backgrounds, the Seafoam transformation item, and announcements for same.
2015-07-01 13:11:53 -05:00
4e7afcbe94
feat(amazon-payments): add a lastBillingDate attribute
2015-07-01 18:59:51 +02:00
65f4aac23c
feat(amazon-payments): working subscriptions, put donations and gifts on hold
2015-06-30 17:59:30 +02:00
0094d3267d
Fixed equivalency check (added missing '=')
2015-06-29 18:28:08 -04:00
bcfc17dd18
Added check for user id in active quest to 'isOnQuest'
2015-06-29 15:42:45 -04:00
0b1cc5f0ea
Removed user.party.quest.key checks from isOnQuest. They are no longer accurate checks due to changes made in #5298
2015-06-29 13:12:29 -04:00
03d1f12a7c
fix isOnQuest function to correctly check for quest being active - fixes https://github.com/HabitRPG/habitrpg/issues/5518
2015-06-29 19:42:22 +10:00
b72b14fe6c
Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync
2015-06-28 21:07:32 -05:00
0fc14f129d
prevent challenge tasks being deleted when challenge ID (cid) has been lost - possible fix for https://github.com/HabitRPG/habitrpg/issues/4466
2015-06-27 14:19:40 +10:00
19f8ca7980
Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync
2015-06-20 17:36:32 -05:00
02acad9dfc
Removed unused 'armorSet' attribute in user model
2015-06-20 01:38:47 -04:00
07b41d16b6
Revert "Revert "new GSalvadi audio theme, created by NomindTR""
...
This reverts commit 30a091e14e
2015-06-18 22:19:35 +10:00
30a091e14e
Revert "new GSalvadi audio theme, created by NomindTR"
2015-06-18 07:39:38 +10:00
910fc2f213
Merge pull request #5407 from Alys/GSalvadi-audio-NOMINDTR-2015-06-15
...
new GSalvadi audio theme, created by NomindTR
2015-06-17 21:39:39 +10:00
b12ee725f4
incrementally enable weekly recap emails
2015-06-16 20:26:58 +02:00
95b481b31d
use discriminator field to distinguish users with weekly recap emails enabled
2015-06-16 17:51:24 +02:00
a82270fbaa
feat(weekly-recap): enable for new users who sign in
2015-06-16 11:15:03 +02:00
14983cb996
replace minus Habit and To-Do sounds, rename NomindTR's theme, rename keys for theme since they aren't live yet
2015-06-16 13:10:49 +10:00
b6b2873faf
add new GSalvadi audio theme, created by NomindTR 70d88957-673a-4edd-b97e-f1ecb018dd89 https://trello.com/c/tljx8gKC/18-music-sound-effects-v3 13 June 2015
2015-06-15 20:33:14 +10:00
14fe29dd4a
Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync
2015-06-14 16:33:38 -05:00
4bf1b94c1d
Removed 'freeRebirth' from user model and all uses in codebase
2015-06-13 14:18:03 -04:00
54681e36b5
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-11 19:47:46 -05:00
ed43bec8cd
Allow default tasks to not have notes
2015-06-10 08:49:26 -05:00
164a26616e
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-05 17:35:16 -05:00
95bb5be22a
Merge branch 'develop' into armoire
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
common/dist/sprites/spritesmith0.css
common/dist/sprites/spritesmith0.png
common/dist/sprites/spritesmith1.css
common/dist/sprites/spritesmith1.png
common/dist/sprites/spritesmith2.css
common/dist/sprites/spritesmith2.png
common/dist/sprites/spritesmith3.css
common/dist/sprites/spritesmith3.png
common/dist/sprites/spritesmith4.css
common/dist/sprites/spritesmith4.png
common/dist/sprites/spritesmith5.css
common/dist/sprites/spritesmith5.png
common/dist/sprites/spritesmith6.css
common/dist/sprites/spritesmith6.png
2015-06-04 15:49:06 -05:00
20859b83ef
feat(Armoire): Improved counter
...
The popover counter of remaining Equipment in the Armoire now counts down immediately instead of requiring a browser refresh. A modal announces when the last item has been found. Also includes several fixes to the Ultimate Gear migration.
2015-06-04 15:45:55 -05:00
db38663f94
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-04 12:45:23 -05:00
865f7651a9
Merge branch 'TheHollidayInn-invite-friends-in-header' into develop
2015-06-04 08:54:04 -05:00
7adde1d1dd
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-03 07:41:09 -05:00
c90f7e2c34
feat(Armoire): WIP
2015-06-02 17:42:14 -05:00
5513061d80
Added invite to friends in header, added setting to hide the invite friends, and localized the invite friends string
2015-06-01 21:07:09 -05:00
8074648c70
Merge branch 'develop' into tutorial
...
Conflicts:
common/locales/en/npc.json
2015-05-31 15:52:12 -05:00
8a6c49f002
feat(weekly-recap): track last date of weekly recap email
2015-05-31 12:10:03 +02:00
6af7342693
feat(tour): Revised intro tutorial
2015-05-29 14:03:42 -05:00
cfcfb8fd02
Changed invite to RSVPNeeded
2015-05-27 09:18:44 -04:00
0fa93506f5
Made quest invite modal pop-up on user sync (rewards display currently nonfunctional)
2015-05-26 23:01:29 -04:00
0c9576733e
Use moment to set startDate
2015-05-23 15:39:18 -05:00
3a8715f0a9
Set default startDate to today if task does not already have them
2015-05-23 15:29:36 -05:00
cfd2f7003b
Merge branch 'develop' into fallenpanda1-improved_dailies
2015-05-23 08:44:56 -05:00
664bf491d2
Adjust fallenPanda's PR
...
* Use enum for frequency in task model
* Adjust ui of task selection
* Correct check for hasStarted
* Remove semicolons
* Set default start day to today
* Correct perfect day and resting in inn tests to have dailies with start dates of a week ago
* Add tests for dailies/weeklies functionality
2015-05-22 22:14:58 -07:00
e7cd3ff533
Set DailySchema’s ‘frequency’ default to weekly to maintain backwards compatibility.
2015-05-15 20:24:47 -07:00
Sabe Jones