Commit graph

1494 commits

Author SHA1 Message Date
Sabe Jones
e88030e15f Merge pull request #6039 from HabitRPG/sabrecat/halloween-mount
Jack-O'-Lantern mounts
2015-10-14 16:46:55 -05:00
Sabe Jones
59b2c1662e fix(news): Revised Bailey 2015-10-14 12:54:33 -04:00
Rory O’Kane
4a23f40415 Fix capitalization of “GitHub” on Contact Us page
The live page is at https://habitica.com/static/contact.
2015-10-14 03:55:46 -04:00
Sabe Jones
dcf17b5505 feat(event): Jack-O'-Lantern mounts 2015-10-12 14:49:12 -04:00
Alys
ece3e0d0aa add FAQ item for World Bosses 2015-10-12 21:26:59 +10:00
Phillip Thelen
87012f6a7c Add iOS start app banner 2015-10-10 13:52:53 +02:00
Alys
20415da586 Merge pull request #6018 from dcecile/develop
Issue #2606 - Verify/fix indices during sortTask
2015-10-09 21:30:14 +10:00
Blade Barringer
2cc4d65d78 Allow disabling logger in non-prod for testing 2015-10-08 22:42:09 -05:00
Sabe Jones
291a135fe1 Merge pull request #6023 from HabitRPG/sabrecat/world-boss
Fall 2015 World Boss
2015-10-08 11:15:00 -05:00
Blade Barringer
36d471ddff Correct module exports 2015-10-08 08:42:42 -05:00
Blade Barringer
5e10b8f4c9 Correct assinging of tavernQuest object when boss damage is calculated 2015-10-08 08:32:40 -05:00
Blade Barringer
9e88d17a78 Adjust tavern export to send over only quest object 2015-10-08 07:45:25 -05:00
Dan Cecile
22284bbc24 Issue #2606 - Verify/fix indices during sortTask
Because the 'sortTask' operation uses a 'from' index and a 'to'
index as parameters, the server needs to check if these indices
are valid before performing the client's request. If the task ID
doesn't match the task at the 'from' index, then it's clear that
the client was looking at a preened list of todos (everything except
more-than-3-days-old-non-quest completed tasks). In that case, try
to recalculate the indices before continuing.
2015-10-06 21:24:34 -04:00
Sabe Jones
51355f7eea fix(quest-eggs): Short-circuit canBuy
Also corrects the FAQ link in the site footer to use the new static FAQ page instead of the wiki.
2015-10-06 16:56:17 -04:00
Sabe Jones
d27fb9dba2 WIP(world-boss): Rage and rewards
Also finishes out written story content.
2015-10-06 15:59:16 -04:00
Sabe Jones
3ca836a81c fix(world-boss): Pass test
Also uncomment the line used to hide display of the boss in the Tavern, because we won't be doing a dry run of that style this time around.
2015-10-05 17:18:44 -04:00
Sabe Jones
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
Sabe Jones
0d7a57d176 Merge branch 'develop' into sabrecat/world-boss
Conflicts:
	common/dist/sprites/habitrpg-shared.css
2015-10-05 14:57:59 -04:00
Sabe Jones
dd53383ec6 Merge pull request #6002 from HabitRPG/sabrecat/backgrounds-201510
October 2015 backgrounds
2015-10-05 11:29:44 -05:00
Blade Barringer
2683b2b0a0 Use var to declare mongoose 2015-10-03 20:55:28 -05:00
Sabe Jones
56419aee25 feat(content): October 2015 backgrounds 2015-10-02 16:13:11 -04:00
Blade Barringer
be3decf859 Merge branch 'develop' into refactor-content 2015-10-01 21:20:04 -05:00
Sabe Jones
8e69681718 chore(news): Bailey 2015-10-01 2015-10-01 15:48:18 -04:00
Sabe Jones
233211adc9 Merge pull request #5962 from HabitRPG/sabrecat/magic-potions
Magic Potions!
2015-10-01 14:04:14 -05:00
Blade Barringer
0f8c3e03c2 Correct mount mixin 2015-10-01 13:25:00 -05:00
Blade Barringer
c8afac9580 Put magic pets on their own row 2015-10-01 13:21:15 -05:00
Blade Barringer
6c9fab254d Add coffeescript dependency back in 2015-09-30 22:49:19 -05:00
Blade Barringer
08e6759da2 Fix path to content 2015-09-30 22:38:23 -05:00
Blade Barringer
6ad7b6ba4c Correct content in analytics 2015-09-30 20:56:40 -05:00
Sabe Jones
3968acecb4 chore(news): Bailey 2015-09-30 2015-09-30 15:39:38 -04:00
Sabe Jones
9afaa92c2e feat(magic-potions): Clarify drop behavior 2015-09-30 15:31:09 -04:00
Sabe Jones
feff6fadfa feat(magic-potions): Final tweaks 2015-09-28 14:58:46 -04:00
Sabe Jones
8dcfe3078f fix(inventory): Missing pixel paws 2015-09-25 16:31:07 -04:00
Sabe Jones
38bdbf020b feat(content): Generalize canBuy 2015-09-25 15:01:08 -04:00
Blade Barringer
c21802e7e7 Merge branch 'develop' into refactor-content 2015-09-25 12:22:11 -05:00
Matteo Pagliazzi
a0f84bcf48 fix a few eslint rules 2015-09-25 15:58:39 +02:00
Sabe Jones
04416c4d73 feat(pets): Improve egg canBuy logic 2015-09-24 17:33:58 -04:00
Sabe Jones
6d6f0f597b feat(world-boss): Dry run 2015-09-24 15:39:16 -04:00
Sabe Jones
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
Sabe Jones
c953a25fe4 Merge branch 'develop' into sabrecat/magic-potions 2015-09-23 16:08:47 -04:00
Sabe Jones
35068481c4 chore(news): Fall plotline Bailey 2015-09-23 15:58:13 -04:00
Sabe Jones
009c92b532 feat(content): September sub items and customizations 2015-09-23 15:23:42 -04:00
Blade Barringer
955c163544 Merge branch 'develop' into refactor-content 2015-09-23 07:52:36 -05:00
Sabe Jones
6a6b67b9c1 Merge pull request #5909 from HabitRPG/sabrecat/social-buttons
Front page Tweet button
2015-09-22 17:38:47 -05:00
Sabe Jones
8c67d22a91 feat(pets): Full purchase behavior 2015-09-22 17:03:41 -04:00
Sabe Jones
e96410aa57 feat(pets): Spooky pets/mounts 2015-09-22 14:23:52 -04:00
Sabe Jones
389b5b370a feat(pets): Magic Hatching Potions WIP 2015-09-21 17:12:23 -04:00
Sabe Jones
b3297383d3 Merge pull request #5954 from HabitRPG/sabrecat/fall-2015
Fall Festival 2015
2015-09-21 12:06:40 -05:00
Blade Barringer
2a530a207d Rename translation key 2015-09-19 10:41:21 -05:00
LuneFox
ec336c4f88 added link to the newbies guild 2015-09-19 01:11:27 +03:00