b591428717
Changed number of columns for ian and popover
2015-07-15 00:13:06 -04:00
9ccab259b0
add message to Inventory/Market (drops) page to explain where quests have gone
2015-07-15 13:29:03 +10:00
0bc5db4885
Merge branch 'aedotj-patch-1' into develop
2015-07-14 21:10:05 -05:00
3437975ba3
Change order of quests
2015-07-14 19:44:55 -05:00
e5a740a74f
Adjust spacing
2015-07-14 19:32:45 -05:00
32a74471db
Merge branch 'sabrecat/quests-page' into develop
2015-07-14 18:56:32 -05:00
435d33724b
Set test to listen on rootScope.openModal
2015-07-14 18:32:50 -05:00
1adb3c479b
Merge branch 'blurbs' into develop
2015-07-14 18:21:37 -05:00
08e9f4f769
fix(test): Quest buy typo
2015-07-14 17:42:15 -05:00
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
8f9fa7942a
fix(settings): use correct value for inactivity emails
2015-07-15 00:13:17 +02:00
1fe900db25
pets.jade: IE better support
...
It is currently impossible to see how fed a pet is in IE. The width of the .progress-bar-success is "{{user.items.pets["Wolf-Base"]/.5}}%".
Now, it works.
2015-07-14 22:58:24 +02:00
5e0d754553
fix(test): Inject Content
2015-07-14 14:55:13 -05:00
79b3597693
fix(tests): Buy specific quest keys
2015-07-14 14:27:25 -05:00
af5b7d4d24
fix(test): Partial tests fix
2015-07-14 14:24:11 -05:00
eb3a72995c
test(quests): Buy quest tests
2015-07-14 12:43:02 -05:00
0955d63998
test(quests): Fix tests
2015-07-14 11:46:13 -05:00
7ad2839f05
Adjust look of page blurbs
2015-07-14 08:18:02 -05:00
cdc54038ba
Remove bad file encoding
2015-07-14 07:56:53 -05:00
7e60864d41
Fixing color on blurbs
2015-07-14 07:46:57 -05:00
1789bf3c6a
Making suggests changes to issue 5513
2015-07-14 07:44:51 -05:00
a25296a855
adding more links to heroes blurb and links not included in json
2015-07-14 07:44:51 -05:00
65b7465081
adding blurbs to pages
2015-07-14 07:44:51 -05:00
6cf0840c71
chore(i18n): update locales
2015-07-14 13:55:03 +02:00
a01b2756f2
Merge pull request #5605 from hairlessbear/join-party-quest-invite-fix
...
Invite a new party member to a quest if the quest is still in the invitation stage (fixes #5598 )
2015-07-13 22:37:46 -05:00
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
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
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
209989d7aa
Merge pull request #5601 from crookedneighbor/quests-fix-merge-coflicts
...
fix merge conflicts for quests refactor
2015-07-13 12:18:27 -07:00
7223eeb681
Invites a new party member to a quest if the quest is still in the invitation stage ( fixes #5598 )
2015-07-13 13:01:35 -04:00
60e92805dd
Remove unneeded comment
2015-07-13 08:36:01 -05:00
87f5449267
Merge branch 'develop' into quests-fix-merge-coflicts
2015-07-13 08:20:52 -05:00
148e418c8a
Change file names to use hyphen syntax
2015-07-13 08:19:15 -05:00
b01e4489ef
Compile sprites
2015-07-12 22:30:46 -05:00
6f4b76edc5
Rename rancher armor to rancher robes
2015-07-12 22:25:05 -05:00
dad6a9527b
Added shop versions of armoire stuff
2015-07-12 22:21:39 -05:00
9ebf5dee2c
Renamed crown sprite
2015-07-12 22:18:08 -05:00
cb992e1083
Added category to whale quest
2015-07-12 21:16:49 -05:00
fefc8ee732
Merge pull request #5600 from gisikw/remove-apdex-check
...
Remove apdex check from middleware until NR is back
2015-07-12 23:50:35 +02:00
4b170cd4dc
chore(i18n): update locales
2015-07-12 23:45:26 +02:00
fe5bbfadde
Remove credit
2015-07-12 14:35:08 -05:00
4e9c252367
Removed extraneous jade file
2015-07-12 14:27:53 -05:00
0b53da0798
Double-check seasonal shop jades
2015-07-12 14:24:18 -05:00
316c3e9c2e
Sort out conflicts from develop
2015-07-12 13:51:42 -05:00
c82e5a885d
Put memory check back in
2015-07-12 13:51:22 -04:00
be420a67a0
Remove apdex check from middleware until NR is back
2015-07-12 13:39:16 -04:00
add35bc17c
Correct names of sprites
2015-07-12 12:21:12 -05:00
6ac049cc71
Allow animal ears to be added to costume or equipped gear
2015-07-12 09:23:03 -05:00
d09b24e1a5
Add sprites to website
2015-07-12 08:24:03 -05:00
92bfc66c67
fix a bug where if you had "Use Costume" ticked, any Battle Gear or Costume choice would be added to your costume, never to Battle Gear
2015-07-12 18:18:31 +10:00
hairlessbear