hairlessbear
a9b3e6bf49
Refactored active time travlers code to move popover closer to NPCs
2015-07-15 01:14:21 -04:00
hairlessbear
4f65bab7bf
Refactored inventory files with NPCs to cause popovers to be close to NPC
2015-07-15 01:00:08 -04:00
hairlessbear
b591428717
Changed number of columns for ian and popover
2015-07-15 00:13:06 -04:00
Alys
9ccab259b0
add message to Inventory/Market (drops) page to explain where quests have gone
2015-07-15 13:29:03 +10:00
Blade Barringer
0bc5db4885
Merge branch 'aedotj-patch-1' into develop
2015-07-14 21:10:05 -05:00
Blade Barringer
3437975ba3
Change order of quests
2015-07-14 19:44:55 -05:00
Blade Barringer
e5a740a74f
Adjust spacing
2015-07-14 19:32:45 -05: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
Greg G.
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
Blade Barringer
7ad2839f05
Adjust look of page blurbs
2015-07-14 08:18:02 -05:00
Blade Barringer
cdc54038ba
Remove bad file encoding
2015-07-14 07:56:53 -05:00
unknown
7e60864d41
Fixing color on blurbs
2015-07-14 07:46:57 -05:00
unknown
1789bf3c6a
Making suggests changes to issue 5513
2015-07-14 07:44:51 -05: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
Blade Barringer
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
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
Alys
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
hairlessbear
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
Blade Barringer
60e92805dd
Remove unneeded comment
2015-07-13 08:36:01 -05:00
Blade Barringer
87f5449267
Merge branch 'develop' into quests-fix-merge-coflicts
2015-07-13 08:20:52 -05:00
Blade Barringer
148e418c8a
Change file names to use hyphen syntax
2015-07-13 08:19:15 -05:00
Blade Barringer
fe5bbfadde
Remove credit
2015-07-12 14:35:08 -05:00
Blade Barringer
4e9c252367
Removed extraneous jade file
2015-07-12 14:27:53 -05:00
Blade Barringer
0b53da0798
Double-check seasonal shop jades
2015-07-12 14:24:18 -05:00
Blade Barringer
316c3e9c2e
Sort out conflicts from develop
2015-07-12 13:51:42 -05:00
Kevin Gisi
c82e5a885d
Put memory check back in
2015-07-12 13:51:22 -04:00
Kevin Gisi
be420a67a0
Remove apdex check from middleware until NR is back
2015-07-12 13:39:16 -04:00
Blade Barringer
6ac049cc71
Allow animal ears to be added to costume or equipped gear
2015-07-12 09:23:03 -05:00
Alys
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
Blade Barringer
87dddb178f
Merge branch 'duckspeaker-issue-5570-hall-of-heroes-table-resize' into develop
2015-07-11 16:53:09 -05:00
Blade Barringer
18ebbdac67
Remove extra class
2015-07-11 16:52:55 -05:00
Blade Barringer
c9ac32231d
Remove inventory again
2015-07-11 16:37:26 -05:00
Blade Barringer
4a9ea83d6b
Added whale quest back in, refactor
2015-07-11 16:35:16 -05:00
Blade Barringer
4acc0c03a8
Add in changes to equipment and seasonalshop
2015-07-11 16:16:29 -05:00
Blade Barringer
b71f68ef32
Merge branch 'develop' into equipment-refactor-merge-into-develop
2015-07-11 15:55:53 -05:00
Blade Barringer
74dee2727e
Remove out of date todo
2015-07-11 15:54:09 -05:00
Blade Barringer
dccc10aa4d
Refactor
2015-07-11 15:05:58 -05:00
Blade Barringer
eeae12b002
Refactore inventory pages
2015-07-11 13:50:30 -05:00
Blade Barringer
066206f41c
Refactored inventory into separate files
2015-07-11 13:13:00 -05:00
Blade Barringer
c33a22ceb3
Put locale key creation into private function
2015-07-11 12:07:20 -05:00
Blade Barringer
94cd0bb852
Use user variable
2015-07-11 11:18:19 -05:00
Blade Barringer
d2e61bf5ef
Change string to str
2015-07-11 11:15:04 -05:00
Blade Barringer
cb4b2e43bf
Change variable name to itemList
2015-07-11 11:14:50 -05:00
Alys
ef496525a1
change white "Report" button to red "Report Violation" button in chat message flag modal
2015-07-11 21:23:39 +10:00
Joe Gallo
aabc50e992
surround tables in table-responsive class
2015-07-11 01:19:47 -04:00
Blade Barringer
305414e152
Merge pull request #5553 from Lokeh/Lokeh/maxHealth
...
maxHealth refactor
2015-07-11 00:18:15 -05:00