Commit Graph

654 Commits

Author SHA1 Message Date
lacrimae
4c88ddc7d1 HabitRPG -> Habitica where missed 2015-07-31 09:37:17 +02:00
Alys
d494d99283 Merge pull request #5706 from lacrimae/patch-2
HabitRPG -> Habitica where missed
2015-07-31 17:34:18 +10:00
lacrimae
2daff46991 HabitRPG -> Habitica where missed 2015-07-31 09:27:30 +02:00
lacrimae
49891d311f HabitRPG -> Habitica where missed 2015-07-31 09:20:20 +02:00
Blade Barringer
a888a120d9 chore(i18n): update locales 2015-07-30 23:25:04 -05:00
Blade Barringer
25fc92d59e chore(i18n): update locales 2015-07-30 22:49:22 -05:00
Blade Barringer
e28bd5bc57 Update English strings 2015-07-30 21:36:09 -05:00
Sabe Jones
65f21619ae feat(naming-day): Bailey etc. 2015-07-30 19:46:04 -05:00
Sabe Jones
2a0a26e5ce feat(naming-day): New logo
Updates the static front page to use the purple gryphon icon, changes same to refer to "Habitica" instead of "HabitRPG", and updates the site favicon to the new logo.
2015-07-30 18:01:47 -05:00
Sabe Jones
bbbae27631 chore(naming-day): Bailey and sprites 2015-07-29 14:12:04 -05:00
Sabe Jones
ceb9cf7817 WIP(event): Habitica Day 2015-07-28 16:20:08 -05:00
Sabe Jones
60d6a479de Merge pull request #5683 from HabitRPG/sabrecat/enable-drops-sooner
Enable pets at Level 3
2015-07-28 13:12:40 -07:00
Sabe Jones
8492541636 fix(visuals): Armoire and Seasonal Shop
Cleans up the Enchanted Armoire sprite and fixes bad alignment of Gem prices on the Seasonal Shop page.
2015-07-28 13:35:17 -05:00
Sabe Jones
13ab60cafe feat(drops): Enable pets at Level 3 2015-07-28 13:28:45 -05:00
Blade Barringer
a23b7d23a9 chore(i18n): update locales 2015-07-28 08:00:08 -05:00
Blade Barringer
d3bcf57246 chore(i18n): update locales 2015-07-28 07:43:40 -05:00
Blade Barringer
08a4e30b8e chore(i18n): update locales 2015-07-27 23:15:48 -05:00
Sabe Jones
4f36ecb8d1 fix(legal): TOS and privacy tweaks
Also updates the front page daily users brag to account for the 25% growth since the introduction of the joinOthers string.
2015-07-27 15:26:31 -05:00
Alys
f5c66e51d1 refactor cron process for todos and dailys to give them separate code 2015-07-26 11:27:00 +10:00
Blade Barringer
bcb128f4b6 Adjust wording for tavern challenge popover 2015-07-24 17:30:38 -05:00
Blade Barringer
791e2f0c16 Add method to get user balance in gems 2015-07-24 17:30:38 -05:00
TheHollidayInn
fce622ddc7 Added hide and error message when a user tries to create a challenge for HabitRPG group and they have no gems 2015-07-24 17:30:36 -05:00
Sabe Jones
3adb315184 feat(death): Release candidate
Version to push live for end user feedback. (Pardon the merge conflict garbage included in prior commit; rerunning spritesmith sorted it out!)
2015-07-24 16:24:14 -05:00
Sabe Jones
d022a0eb67 Merge branch 'develop' into sabrecat/death-modal
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith0.png
	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
2015-07-24 16:11:51 -05:00
Blade Barringer
fca6f91f13 Merge branch 'develop' into analytics-service-server-side 2015-07-24 15:19:31 -05:00
Sabe Jones
65c2f5c9d5 fix(death): Gentler wording 2015-07-23 17:08:00 -05:00
Sabe Jones
d32d05e873 feat(mystery): July 2015 goodies
Also makes the mystery box opening notification translatable and adds item graphics to it.
2015-07-23 12:05:13 -05:00
Blade Barringer
bfd56b35e1 Revert armoire counting code back to old system
@TODO: work out why it's hpapening and unpend test for new system
2015-07-23 08:43:08 -05:00
Alys
c3e2b92546 add all the files I forgot to add for 02cccb01ef (blank placeholder image for collection quests, partial fix for #4936) 2015-07-23 13:58:38 +10:00
Blade Barringer
36a082f4ef chore(i18n): update locales 2015-07-22 21:51:17 -05:00
Blade Barringer
d8434a5512 chore(i18n): update locales 2015-07-22 21:24:10 -05:00
Blade Barringer
c41271e558 Merge branch 'develop' into refactor_member_modal_and_stats_page 2015-07-22 17:39:39 -05:00
Blade Barringer
7b9102c88c Move gear counting to counting script 2015-07-22 17:37:35 -05:00
Blade Barringer
f40cfd2b66 Move all pet counting to shared count scripts 2015-07-22 17:32:12 -05:00
Sabe Jones
7d622792a8 Merge pull request #5635 from HabitRPG/sabrecat/quests-page
Improve quest drop notification
2015-07-22 10:28:16 -07:00
Blade Barringer
de30d6bf0c chore(i18n): update locales 2015-07-22 07:41:49 -05:00
Alys
02cccb01ef add blank placeholder image for collection quests that don't have quest box artwork - partial fix for https://github.com/HabitRPG/habitrpg/issues/4936 2015-07-22 20:48:06 +10:00
Blade Barringer
063e53b0ea Added function to count pets that are actually owned 2015-07-21 20:14:15 -05:00
Blade Barringer
20660f50c0 Add count function for remaining items in gear set 2015-07-21 18:06:07 -05:00
Sabe Jones
5789f22320 WIP(death): Draft with decal 2015-07-21 14:39:08 -05:00
Sabe Jones
0039a17366 WIP(death): More display tweaks 2015-07-21 13:57:13 -05:00
Blade Barringer
73e1764413 Move beast/mount master counts to separate file 2015-07-21 08:13:50 -05:00
Sabe Jones
c286d08bc8 WIP(death): New death modal 2015-07-20 16:24:05 -05:00
Blade Barringer
3d40da4004 Remove countPets and countMounts from codebase 2015-07-20 08:11:00 -05:00
Blade Barringer
2695419182 Use better beastMaster / mountMaster counts 2015-07-19 21:51:30 -05:00
Blade Barringer
054d884154 Merge branch 'develop' into analytics-service-server-side 2015-07-19 10:13:34 -05:00
Blade Barringer
a950339f01 Clarify cron 2015-07-19 08:41:45 -05:00
Blade Barringer
a139ca8ba5 Merge branch 'develop' into refactor_member_modal_and_stats_page 2015-07-18 17:10:04 -05:00
Blade Barringer
dc2fab14d0 Merge branch 'GitHubSphinx-Sphinx-i18n-db1' into develop 2015-07-18 17:06:26 -05:00
Blade Barringer
f9304bd28f Move stat calc scripts to angular service 2015-07-18 16:00:06 -05:00