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
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
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
Bill Parrott
9cf4d9086b
be more explicit about priority value vs context class
2015-02-16 15:49:31 -06:00
Bill Parrott
812599cb77
add difficulty context class to task list items
2015-02-16 15:02:04 -06:00
Blade Barringer
c91b0cd34a
Moved folders into common directory
2015-01-21 10:34:04 -06:00
