 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 |
|
|
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 |
|