2cb4e80019
chore(event): End Fall Festival
2015-11-02 12:55:48 -05:00
add761e58e
Remove extraneous div
2015-10-30 23:05:19 -05:00
92271c2049
Clean up view for market.
2015-10-30 22:49:13 -05:00
1051ff0006
Fix inline-styling to be class styling
2015-10-30 20:01:22 -07:00
64ea4e42e7
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into merchant-button-fix
2015-10-30 03:43:35 -07:00
0e52a62ad2
dynamic images for merchant, finishes refactor
2015-10-30 03:43:13 -07:00
e1b26a884c
Add display for selling items, needs right img
2015-10-30 02:27:36 -07:00
dd09633d31
Merge branch 'locks-auto-equip' into develop
2015-10-29 12:25:18 -05:00
f2c856f6e6
Make link translatable in options/inventory/time-travelers
2015-10-23 23:40:11 +08:00
d0a34fc0ad
feat(quests): 2015-10 Pet
...
Also adds Exhaust Strike-specific text to the remaining affected NPCs.
2015-10-20 12:32:45 -04:00
73924df241
Adds auto-equip UI to equipment view
2015-10-19 05:20:11 +00:00
380265731f
feat(world-boss): Exhaust Ian's text
2015-10-14 21:02:59 -04:00
40ea62344b
Add bold to item output when selling item
2015-10-07 20:11:07 -07:00
7c16197ec9
Refactor market to display eggs properly, wip
2015-10-07 19:19:56 -07:00
dadf1d5b0b
Add divider between sell button and text for market
2015-10-07 11:52:47 -07:00
d27fb9dba2
WIP(world-boss): Rage and rewards
...
Also finishes out written story content.
2015-10-06 15:59:16 -04:00
f6abcc0ddf
WIP(world-boss): Initial stats outlay
...
Also quest reward sprites, groundwork for world damage, and partial content build.
2015-10-05 16:59:19 -04:00
0f8c3e03c2
Correct mount mixin
2015-10-01 13:25:00 -05:00
c8afac9580
Put magic pets on their own row
2015-10-01 13:21:15 -05:00
9afaa92c2e
feat(magic-potions): Clarify drop behavior
2015-09-30 15:31:09 -04:00
feff6fadfa
feat(magic-potions): Final tweaks
2015-09-28 14:58:46 -04:00
8dcfe3078f
fix(inventory): Missing pixel paws
2015-09-25 16:31:07 -04:00
38bdbf020b
feat(content): Generalize canBuy
2015-09-25 15:01:08 -04:00
04416c4d73
feat(pets): Improve egg canBuy logic
2015-09-24 17:33:58 -04:00
1aa5757847
fix(magic-potions): Hatching tweaks
...
* Additional notes on popover noting magic potions can't be used on quest pet eggs
* Less techy error message when attempting to hatch quest pet egg with magic potion
* Don't highlight quest pet eggs as targets for magic hatching potion
2015-09-23 16:40:45 -04:00
8c67d22a91
feat(pets): Full purchase behavior
2015-09-22 17:03:41 -04:00
e96410aa57
feat(pets): Spooky pets/mounts
2015-09-22 14:23:52 -04:00
389b5b370a
feat(pets): Magic Hatching Potions WIP
2015-09-21 17:12:23 -04:00
3e8a3ee5f4
feat(event): Fall Festival 2015
2015-09-18 15:19:59 -04:00
eb0dd636c1
feat(hourglass): Confirm before buy
2015-09-16 17:40:25 -04:00
c8cc01fc44
feat(hourglass): Buy pets/mounts
...
Functionally complete as of this commit. Further commits will provide more polish and refactoring.
2015-09-16 14:35:43 -04:00
5974c7e079
Simplify time travelers page
2015-09-13 18:27:57 -05:00
d5eaaefa72
Adjust positioning of alert message
2015-09-13 16:56:39 -05:00
5553d74334
Create method to calculate whether or not user has attained all mystery equipment
2015-09-13 16:26:29 -05:00
7c8a46b178
Move message into alert box
2015-09-13 09:34:54 -05:00
05cf144630
Pulled and merged
2015-09-09 23:23:45 +01:00
f3ec5ccb89
Added whitespace before all items owned message
2015-09-09 17:40:59 +01:00
41b4d497f7
Merge branch 'develop' into sabrecat/pet-201509
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
common/dist/sprites/spritesmith2.css
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-09-08 13:25:10 -05:00
def3eb5c36
Now correctly displays message when user owns all Mystery items
2015-09-08 17:49:56 +01:00
2bddd79ffd
Some things I tried
2015-09-08 13:59:34 +01:00
b2bb6016fa
Added +1 Hourglass to debug menu
2015-09-02 18:12:48 +01:00
3ccf09ca27
feat(quests): Horse quest
2015-09-01 13:26:41 -04:00
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
Sabe Jones