Commit graph

618 commits

Author SHA1 Message Date
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
Blade Barringer
73e1764413 Move beast/mount master counts to separate file 2015-07-21 08:13:50 -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
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
Blade Barringer
3926a6e95a Remove unnecssary semicolons 2015-07-18 16:00:06 -05:00
Blade Barringer
ff42505d1b Add string 2015-07-18 16:00:05 -05:00
Blade Barringer
2b4e48fbe6 Add stat calc to common 2015-07-18 16:00:05 -05:00
Blade Barringer
163b0545e8 Adjustments for error handling 2015-07-18 16:00:04 -05:00
Blade Barringer
6d5b57d139 Add class bonus calc function 2015-07-18 16:00:04 -05:00
Blade Barringer
e5428f29c1 Add calculation for equipment stat bonus 2015-07-18 16:00:04 -05:00
Blade Barringer
841923e054 Add level bonus calculation script 2015-07-18 16:00:03 -05:00
Matteo Pagliazzi
3fa8ab80b5 chore(i18n): update locales 2015-07-17 15:31:12 +02:00
Matteo Pagliazzi
86eaff7cb0 fix(i18n): string for amazon payments 2015-07-17 15:28:55 +02:00
Sabe Jones
ffc441ab82 feat(quests): Improve drop notif 2015-07-16 16:22:49 -05:00
Sabe Jones
2407c9eeb8 feat(quests): Improve buy confirm dialog 2015-07-16 12:56:26 -05:00
Blade Barringer
668a8bb6f6 chore(i18n): update locales 2015-07-16 12:04:10 -05:00
GihHubSphinx
aa0aec8d4b Revert "New string in stats if gear has no benefits (take 2)"
This reverts commit fdbd18a8ed.
2015-07-16 10:54:17 +05:00
Alys
239f7c9c95 change message on Armoire when it is empty to say that new gear arrives in the first week of the month 2015-07-16 12:56:28 +10:00
Blade Barringer
8a97b597f5 Resize sea foam image
Fixes #5609
2015-07-15 07:53:12 -05:00
Matteo Pagliazzi
38ac664284 chore(i18n): update locales 2015-07-15 13:17:57 +02:00
Alys
d8e7108098 moved twoHanded:true out of bracketed region in rancherLasso - it was causing "Error processing the string" 2015-07-15 14:56:57 +10:00
Alys
9ccab259b0 add message to Inventory/Market (drops) page to explain where quests have gone 2015-07-15 13:29:03 +10:00
Sabe Jones
32a74471db Merge branch 'sabrecat/quests-page' into develop 2015-07-14 18:56:32 -05:00
Blade Barringer
1adb3c479b Merge branch 'blurbs' into develop 2015-07-14 18:21:37 -05:00
Sabe Jones
6cad2df6a3 test(quests): Add user.ops.buyQuest test
Also adds the Bailey announcement for the day and implements "locked" quest scrolls for the beginning quests in extant quest chains.
2015-07-14 17:34:01 -05:00
Matteo Pagliazzi
8f9fa7942a fix(settings): use correct value for inactivity emails 2015-07-15 00:13:17 +02:00
unknown
a25296a855 adding more links to heroes blurb and links not included in json 2015-07-14 07:44:51 -05:00
unknown
65b7465081 adding blurbs to pages 2015-07-14 07:44:51 -05:00
Matteo Pagliazzi
6cf0840c71 chore(i18n): update locales 2015-07-14 13:55:03 +02:00
Sabe Jones
266b6b87e2 test(quests): Quests Service spec WIP
First test on new Quests Service. Also fix Armoire tests to account for new items.
2015-07-13 19:16:29 -05:00
Sabe Jones
b9f795529b feat(quests): Dilatory Distress
Implements the "Dilatory Distress" quest chain, purchasable for Gold. Also adds four new items to the Enchanted Armoire.
2015-07-13 18:21:32 -05:00
Blade Barringer
87f5449267 Merge branch 'develop' into quests-fix-merge-coflicts 2015-07-13 08:20:52 -05:00
Blade Barringer
b01e4489ef Compile sprites 2015-07-12 22:30:46 -05:00
Blade Barringer
6f4b76edc5 Rename rancher armor to rancher robes 2015-07-12 22:25:05 -05:00
Blade Barringer
dad6a9527b Added shop versions of armoire stuff 2015-07-12 22:21:39 -05:00