705e0dce71
Calculate days since task start with start of day
2015-06-04 08:25:06 -05:00
7adde1d1dd
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-03 07:41:09 -05:00
766f3b6057
Merge pull request #5307 from HabitRPG/tutorial
...
Tutorial overhaul
2015-05-31 13:58:12 -07:00
719ae1c89d
Add missing ?; common tests pass
2015-05-30 23:10:44 -05:00
726a8f1acb
feat(analytics): Mixpanel implementation WIP
2015-05-29 16:22:35 -05:00
6af7342693
feat(tour): Revised intro tutorial
2015-05-29 14:03:42 -05:00
8b347bca8b
Remove everyX check from weeklies; Change UI of frequency selection; Prep for monthlies in UI
2015-05-26 17:59:11 -05:00
3098cacf03
feat(subscriber): May Mystery Items
2015-05-25 21:03:13 -05:00
cfd2f7003b
Merge branch 'develop' into fallenpanda1-improved_dailies
2015-05-23 08:44:56 -05:00
90dd078a6a
Fixed bug where we were using moment.startOf instead of api.startOfDay in shouldDo.
2015-05-23 02:29:06 -07:00
56f0e3ae4a
Removed unnecessary TODOs.
2015-05-22 22:18:17 -07:00
664bf491d2
Adjust fallenPanda's PR
...
* Use enum for frequency in task model
* Adjust ui of task selection
* Correct check for hasStarted
* Remove semicolons
* Set default start day to today
* Correct perfect day and resting in inn tests to have dailies with start dates of a week ago
* Add tests for dailies/weeklies functionality
2015-05-22 22:14:58 -07:00
1f0dbef3c7
Merge pull request #5234 from hairlessbear/ethereal_surge_split_fix
...
Fixed Ethereal Surge notification split
2015-05-22 23:23:34 -05:00
13faf8d0c7
feat(pets): Sheep Quest
2015-05-20 20:45:18 -07:00
2b72050827
fix(accessories): Buyback for ears
...
Fixes #5236 .
2015-05-20 13:10:05 -07:00
bd76b762e6
Merge pull request #5212 from HabitRPG/negue-WIP-Push-notifications
...
Negue wip push notifications
2015-05-18 11:14:53 -05:00
fd8fabad43
Fixed Ethereal Surge notification split
2015-05-18 00:45:44 -04:00
dd1b2a4b07
In taskDefaults method, added default values for new fields: startDate, everyX, and frequency.
2015-05-15 20:24:47 -07:00
d1805f9181
Fixed issue where incorrect time type passed in for shouldDo’s ‘day’ argument (should be a Date, sometimes Moment is passed in). Fixed incorrect comparison between Moment and Date.
2015-05-15 20:24:47 -07:00
fbb636a339
Removed stray debugging console logs.
2015-05-15 20:24:47 -07:00
1ecf608408
Added support in daily tasks for specifying ’every X days’ and ‘every X weeks on specific days of the week’.
...
- shouldDo() now takes the entire task as an input instead of just the ‘repeat’ (days of the week) dictionary.
- the ‘start’ date for a task can be specified (and can also be in the future, in which case it will be greyed out until then.) ‘start’ date also affects ‘every X days’ and ‘every X weeks’.
- no migration code yet.
2015-05-15 20:24:46 -07:00
84b333e5c1
fix(unlocks): Handle undefined/null balance
2015-05-13 15:34:23 -05:00
6e27b7af9d
fix(purchases): Handle undefined/null balance
2015-05-13 15:15:40 -05:00
35ff90b4d3
Merge remote-tracking branch 'origin/new_inn_behavior_PR' into pet-skins
2015-05-13 12:12:57 -05:00
29109051d7
feat(customize): Animal skins and ears
...
Implements a base-pet-themed set of avatar skins and head accessories, the latter of which has additional handling for the user to purchase them from the Avatar Customization page.
2015-05-13 11:19:08 -05:00
dca45d7845
Enable new inn behavior
2015-05-13 08:44:08 -05:00
1cc07129f1
Merge branch 'develop' into pushNotifications2
...
Conflicts:
test/api.mocha.coffee
2015-05-10 22:01:41 +02:00
1dec4ba7a6
allow MP gained for Habits and Dailies to be increased when a critical hit occurs (crits are triggered in addPoints)
2015-05-10 18:17:17 +10:00
90edb7719f
Merge branch 'develop' into pushNotifications2
2015-05-08 23:21:18 +02:00
00db42b6c0
feat(backgrounds): May BGs
2015-05-06 19:41:54 -05:00
e09d4f3a91
Commented out new dailies behavior
2015-05-03 08:21:29 -05:00
68aedda3bb
Merge branch 'develop' into hairlessbear-cron_dailies_fix
2015-05-02 22:10:58 -05:00
c81d321366
Checklists should reset even when resting in the inn
2015-05-02 22:10:26 -05:00
02781d1f33
remove markModified in addPushDevice
2015-04-28 19:55:01 +02:00
b23e901780
Merge branch 'develop' into pushNotifications2
2015-04-27 17:20:25 +02:00
983d2eb2be
Merge remote-tracking branch 'upstream/develop' into rebalancing-2015-03
2015-04-26 16:38:17 +10:00
e9e0ff52e4
Update index.coffee
2015-04-24 04:32:47 -04:00
de8facd58e
Dailies reset without causing damage when resting at Inn
2015-04-24 04:07:51 -04:00
77a07c1e53
add official name of each skill as a comment
2015-04-24 16:29:16 +10:00
7a7fc96818
feat(mystery): April Subscribee Items
2015-04-21 21:14:19 -05:00
9292a46b6f
Merge remote-tracking branch 'upstream/develop' into rebalancing-2015-03
2015-04-18 18:39:19 +10:00
7d1a58ca00
fix(slimes): Tweaks and missing sprite
...
Slimes don't have skeletons anyway, right?
2015-04-15 18:48:57 -05:00
f13c6cba00
feat(pets): Slime Quest
2015-04-15 18:08:43 -05:00
556a1640c6
Merge remote-tracking branch 'upstream/develop' into rebalancing-2015-03
...
Conflicts:
common/dist/scripts/habitrpg-shared.js
common/script/content.coffee
common/script/index.coffee
2015-04-09 16:50:10 +10:00
fee002b289
feat(analytics): better events organization via category>label>action>value
2015-04-08 17:29:55 -06:00
616a7d9650
feat(backgrounds): April BGs
2015-04-06 19:03:24 -05:00
e134c36ca2
prevent user.stats.points from being negative e.g., after dropping level with Fix Character Values (still need to remove allocated points then)
2015-04-05 09:04:59 +10:00
8033b129ff
Merge pull request #4915 from gisikw/free_100_key_to_the_kennels
...
Make Key to the Kennels free for Triad Bingoers.
2015-04-04 10:48:15 +10:00
f432bc1f17
Merge pull request #4919 from TheHollidayInn/spells-level-with-exp
...
Added sync on mage fireball spell and rogue backstab skill and give correct mp reduction notification for ethereal surge
2015-04-04 00:29:41 +10:00
dcb13a3ed6
Merge remote-tracking branch 'upstream/develop' into rebalancing-2015-03
2015-04-03 11:21:04 +10:00
Blade Barringer