e4eae7a23b
Move ian inside quest scrolls div
2015-08-22 15:43:35 -05:00
a6c5fab8a7
Correct quest display bug
2015-08-22 15:36:29 -05:00
65888d3f8a
Merge branch 'develop' into sabrecat/party-page
2015-08-20 07:39:25 -05:00
190fdd5bb9
feat(pets): August cheetah quest
2015-08-19 16:55:14 -04:00
b902ff63a2
Merge branch 'develop' into sabrecat/party-page
2015-08-19 08:07:34 -05:00
fa7f957ccc
Update habitrpg.com to habitica.com where applicable
2015-08-19 08:00:34 -05:00
344eded949
Merge branch 'develop' into sabrecat/party-page
2015-08-17 19:04:25 -05:00
9e47bc3f4c
Merge branch 'GitHubSphinx-Sphinx-i18n-db1' into develop
2015-08-14 20:11:37 -05:00
0f31873262
Merge branch 'develop' into sabrecat/party-page
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
common/dist/sprites/spritesmith1.css
common/dist/sprites/spritesmith1.png
common/dist/sprites/spritesmith4.css
common/dist/sprites/spritesmith4.png
website/views/options/social/index.jade
2015-08-14 11:23:35 -05:00
00a212660a
feat(greeting-cards): Thank-You & Greets
2015-08-13 16:58:31 -05:00
f57e3e69a1
WIP(greeting-cards): Working send + modals
2015-08-13 15:43:51 -05:00
b2100c2c54
WIP(greeting-cards): Abandon spell refactor
2015-08-13 14:31:34 -05:00
dd7ace7eb3
Reconstructing pets and mounts progress strings
...
Second take, keeping the previous view
2015-08-13 20:39:23 +05:00
c711074809
Duplicating 2 strings for better i18n
...
Duplicating strings "Pets Found" and "Mounts Tamed" used in inventory
and in stats with different order of numbers - words
2015-08-12 23:39:11 +05:00
3c8424a83e
Merge branch 'crookedneighbor/refactor_cards' into sabrecat/greeting-cards
2015-08-12 11:53:28 -05:00
203a26b6df
Refactor how cards are recieved
2015-08-12 08:36:57 -05:00
879ba83002
change habitrpg.com to habitica.com where appropriate - email addresses in static Contact page and various in-game URLs
2015-08-12 16:12:59 +10:00
28ae6afd92
WIP(party-page): UI draft
2015-08-10 13:42:36 -05:00
af4bb5e23f
chore(news): End Summer Splash
2015-08-02 14:09:26 -05:00
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
e72543641c
Puts keys of the kennel modal on the inventory ctrl so pet counting variables can be accesssed
...
Closes #5668
2015-07-25 23:22:35 -05:00
65c14b1e3f
Refactor inventory ctrl variables
2015-07-20 12:51:10 -05:00
4e6c2e7335
Add missing classes
2015-07-18 16:59:54 -05:00
c61c572887
'.row.col-md-12' changed to '.row: .col-md-12'
2015-07-16 21:10:48 -04:00
eae7f79363
Fixed time traveler items repositioning strangely on window resize
2015-07-16 20:37:14 -04:00
e2073f75b8
Refactored inventory file NPCs to use Bootstrap v3 grid and CSS instead of tables
2015-07-16 20:19:32 -04:00
6c6c9b3464
Change Ian on quests page to not use tables
2015-07-15 08:19:39 -05:00
a9b3e6bf49
Refactored active time travlers code to move popover closer to NPCs
2015-07-15 01:14:21 -04:00
4f65bab7bf
Refactored inventory files with NPCs to cause popovers to be close to NPC
2015-07-15 01:00:08 -04:00
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
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
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
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
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
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
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
c9ac32231d
Remove inventory again
2015-07-11 16:37:26 -05:00
4a9ea83d6b
Added whale quest back in, refactor
2015-07-11 16:35:16 -05:00
4acc0c03a8
Add in changes to equipment and seasonalshop
2015-07-11 16:16:29 -05:00
b71f68ef32
Merge branch 'develop' into equipment-refactor-merge-into-develop
2015-07-11 15:55:53 -05:00
74dee2727e
Remove out of date todo
2015-07-11 15:54:09 -05:00
eeae12b002
Refactore inventory pages
2015-07-11 13:50:30 -05:00
Blade Barringer