Blade Barringer
7adde1d1dd
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-03 07:41:09 -05:00
Sabe Jones
c90f7e2c34
feat(Armoire): WIP
2015-06-02 17:42:14 -05:00
Blade Barringer
719ae1c89d
Add missing ?; common tests pass
2015-05-30 23:10:44 -05:00
Sabe Jones
726a8f1acb
feat(analytics): Mixpanel implementation WIP
2015-05-29 16:22:35 -05:00
Blade Barringer
8b347bca8b
Remove everyX check from weeklies; Change UI of frequency selection; Prep for monthlies in UI
2015-05-26 17:59:11 -05:00
Blade Barringer
cfd2f7003b
Merge branch 'develop' into fallenpanda1-improved_dailies
2015-05-23 08:44:56 -05:00
Allen Pan
90dd078a6a
Fixed bug where we were using moment.startOf instead of api.startOfDay in shouldDo.
2015-05-23 02:29:06 -07:00
Allen Pan
56f0e3ae4a
Removed unnecessary TODOs.
2015-05-22 22:18:17 -07:00
Blade Barringer
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
Blade Barringer
bd76b762e6
Merge pull request #5212 from HabitRPG/negue-WIP-Push-notifications
...
Negue wip push notifications
2015-05-18 11:14:53 -05:00
Allen Pan
dd1b2a4b07
In taskDefaults method, added default values for new fields: startDate, everyX, and frequency.
2015-05-15 20:24:47 -07:00
Allen Pan
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
Allen Pan
fbb636a339
Removed stray debugging console logs.
2015-05-15 20:24:47 -07:00
Allen Pan
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
Sabe Jones
84b333e5c1
fix(unlocks): Handle undefined/null balance
2015-05-13 15:34:23 -05:00
Sabe Jones
6e27b7af9d
fix(purchases): Handle undefined/null balance
2015-05-13 15:15:40 -05:00
Sabe Jones
35ff90b4d3
Merge remote-tracking branch 'origin/new_inn_behavior_PR' into pet-skins
2015-05-13 12:12:57 -05:00
Sabe Jones
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
Blade Barringer
dca45d7845
Enable new inn behavior
2015-05-13 08:44:08 -05:00
Negue
1cc07129f1
Merge branch 'develop' into pushNotifications2
...
Conflicts:
test/api.mocha.coffee
2015-05-10 22:01:41 +02:00
Alys
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
Negue
90edb7719f
Merge branch 'develop' into pushNotifications2
2015-05-08 23:21:18 +02:00
Blade Barringer
e09d4f3a91
Commented out new dailies behavior
2015-05-03 08:21:29 -05:00
Blade Barringer
68aedda3bb
Merge branch 'develop' into hairlessbear-cron_dailies_fix
2015-05-02 22:10:58 -05:00
Blade Barringer
c81d321366
Checklists should reset even when resting in the inn
2015-05-02 22:10:26 -05:00
Negue
02781d1f33
remove markModified in addPushDevice
2015-04-28 19:55:01 +02:00
Negue
b23e901780
Merge branch 'develop' into pushNotifications2
2015-04-27 17:20:25 +02:00
hairlessbear
e9e0ff52e4
Update index.coffee
2015-04-24 04:32:47 -04:00
hairlessbear
de8facd58e
Dailies reset without causing damage when resting at Inn
2015-04-24 04:07:51 -04:00
Alys
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
Tyler Renelle
fee002b289
feat(analytics): better events organization via category>label>action>value
2015-04-08 17:29:55 -06:00
Alys
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
Alice Harris
1432d2a61a
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-03-28 12:40:46 +10:00
Negue
7105bc195f
add all Changes of #4565
2015-03-27 18:35:32 +01:00
Kevin Gisi
ca87a46b04
Adjusted Key to the Kennel logic so only *release both* is free with Triad Bingo achievement
2015-03-26 18:30:56 -04:00
Kevin Gisi
334393d33b
Make Key to the Kennels free for Triad Bingoers.
...
* Updated logic in `common/script/index.coffee` to accept Triad Bingo
achievement in lieu of gems.
* Removed Gem cost on inventory page if user has achievement.
* Updated Key to the Kennels modal to hide "Buy Gems" button if user has
achievement.
* Removed Gem costs from buttons if user has achievement.
* Added new copy for Key to the Kennels modal that omits gem prices if the user
has the achievement.
2015-03-26 18:30:56 -04:00
Tyler Renelle
e46789c303
feat(analytics): track cron count
2015-03-26 17:11:33 -04:00
Sabe Jones
77cc05a668
fix(pets): Eggy eggy feed
2015-03-25 22:01:42 -05:00
Alice Harris
c47606c5b2
remove Show Tour button from Settings->Site; (unrelated to that) delete an outdated comment
2015-03-17 07:49:37 +10:00
George Millo
293f41d087
%w"" syntax is native Ruby, not Rails
2015-03-15 14:48:36 +01:00
Bill Parrott
45287f3e4d
merge upstream and fix leveling loop
2015-03-14 21:32:27 -05:00
Alice Harris
2f072d8e96
Merge branch 'StealthMod' of https://github.com/Verabird/habitrpg into rebalancing-2015-03-2
...
Conflicts:
common/script/index.coffee
2015-03-14 18:54:18 +10:00
Verabird
180d87e9c7
removed commented out old stealth code
2015-03-13 10:53:29 -04:00
Verabird
4a0f165af8
Modify daily checklists to stay checked at cron if inactive and Stealth to only apply to active dailys
2015-03-13 10:53:29 -04:00
Bill Parrott
df0bf3136f
move max level tweaks to rebalancing branch
2015-03-13 07:48:14 -05:00
Blade Barringer
c23730fdbf
Merge branch 'develop' of github.com:HabitRPG/habitrpg into rebalancing
2015-03-06 07:47:10 -06:00
Blade Barringer
016e359690
Fixes #4749
2015-02-24 16:58:48 -06:00
Blade Barringer
5aa4015249
Refactored pet display name changes
2015-02-22 12:12:38 -05:00
Blade Barringer
f355672b3b
Merge pull request #4703 from scribblypanda/issue2825
...
added pet colour to feed/evolve notif
2015-02-22 12:12:23 -05:00
scribblypanda
d46633b089
added pet colour to feed/evolve notif
2015-02-17 12:54:34 -05:00
