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
Alys
20726e3c0f
Merge pull request #4873 from gisikw/repair_broken_test_suite
...
Repair Broken Test Suite - Full Passing Tests
2015-03-26 14:49:28 +10:00
Sabe Jones
4f89f68797
fix(mounts): Eggy eggy basket
2015-03-25 22:10:51 -05:00
Sabe Jones
77cc05a668
fix(pets): Eggy eggy feed
2015-03-25 22:01:42 -05:00
Sabe Jones
b24dbe9b86
feat(March): Eggy eggy mystery
2015-03-25 19:53:07 -05:00
Kevin Gisi
f41933b7a1
Repair Broken Test Suite - Full Passing Tests
...
* Repair broken e2e test introduced in 8d03cfc
2015-03-24 21:39:03 -04:00
Alice Harris
160b19eb70
remove growl notification about party settings saved after changing party order (not needed now that avatars in head are resorted immediately)
2015-03-22 17:50:22 +10:00
Sabe Jones
f3f5669ab2
feat(spring): Fling
2015-03-20 14:56:00 -05:00
Sabe Jones
4c5f4377ff
fix(quests): Alternate unlock strings
2015-03-17 21:48:22 -05:00
Sabe Jones
4cb6783544
feat(quest): Bunny quest
2015-03-17 21:24:46 -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
Tyler Renelle
de67f44e1f
Merge pull request #4713 from HabitRPG/lefnire/interactive-tour
...
Interactive Tour
2015-03-10 19:23:01 -06:00
Alice Harris
3bd0b57efa
add semi-colon at end of line; remove apostrophe from comment
2015-03-11 09:29:44 +10:00
Alys
63c57cce5d
Merge pull request #4785 from AAorris/develop
...
Allow for client notifications to user settings
2015-03-11 08:20:51 +10:00
Tyler Renelle
812493fec5
feat(tour): Refactor the Justin Guide to be much more streamlined and interactive. Backdrop focuses user on present task. Chapterized guides
2015-03-10 15:40:18 -06:00
Sabe Jones
21fd8061cf
feat(backgrounds): March BGs
2015-03-03 21:42:15 -06:00
Aaron Morris
d9b10a4373
making strings translatable
...
not translating the body keys though...
2015-03-02 21:13:18 -05:00
Aaron Morris
ec15f239c6
removing extraneous lines
...
Not sure about translations yet...
2015-03-02 21:00:50 -05:00
Aaron Morris
b484dd3208
Allow for client notifications to user settings
...
Added functionality on successful user changes (see userNotifications
object in userServices.js)
On this commit, it will tell the user "Party order updated" when the
sorting settings change.
2015-03-02 09:00:37 -05:00
Sabe Jones
d4f8acd0ef
feat(mystery): February 2015
2015-02-24 20:15:31 -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
Bill Parrott
789575d6fb
Merge branch 'develop' into task-difficulty-context-classes
2015-02-17 22:31:27 -06:00
Sabe Jones
0608ac5caa
feat(quest): Pet Rocks
2015-02-17 20:02:06 -06: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
9ddb5e35fb
Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
...
Conflicts:
common/dist/scripts/habitrpg-shared.js
common/dist/sprites/habitrpg-shared.css
common/img/sprites/spritesmith/customize/hair/hair_base_10_TRUEred.png
common/img/sprites/spritesmith/customize/hair/hair_base_11_TRUEred.png
common/img/sprites/spritesmith/customize/hair/hair_base_12_TRUEred.png
common/img/sprites/spritesmith/customize/hair/hair_base_13_TRUEred.png
common/img/sprites/spritesmith/customize/hair/hair_base_14_TRUEred.png
common/img/sprites/spritesmith/customize/hair/hair_base_9_TRUEred.png
img/sprites/spritesmith/customize/hair/hair_base_10_TRUEred.png
img/sprites/spritesmith/customize/hair/hair_base_10_TRUred.png
img/sprites/spritesmith/customize/hair/hair_base_11_TRUEred.png
img/sprites/spritesmith/customize/hair/hair_base_11_TRUred.png
img/sprites/spritesmith/customize/hair/hair_base_12_TRUEred.png
img/sprites/spritesmith/customize/hair/hair_base_12_TRUred.png
img/sprites/spritesmith/customize/hair/hair_base_13_TRUEred.png
img/sprites/spritesmith/customize/hair/hair_base_13_TRUred.png
img/sprites/spritesmith/customize/hair/hair_base_14_TRUEred.png
img/sprites/spritesmith/customize/hair/hair_base_14_TRUred.png
img/sprites/spritesmith/customize/hair/hair_base_9_TRUEred.png
img/sprites/spritesmith/customize/hair/hair_base_9_TRUred.png
2015-02-12 13:42:11 -06:00
Blade Barringer
45d1fb4c6e
Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
...
Conflicts:
common/dist/scripts/habitrpg-shared.js
2015-02-09 22:18:22 -06:00
Blade Barringer
28b9ad11cb
Added paths for common scripts
2015-02-04 13:22:41 -06:00
Blade Barringer
5d9cda3b76
Corrected some paths to serve files directly from comon
2015-02-04 12:25:14 -06:00
Blade Barringer
450fdb1486
Merge branch 'common-convert' of github.com:HabitRPG/habitrpg into common-convert
2015-02-03 19:29:54 -06:00
Blade Barringer
47f05f452e
Merge branch 'common-convert' of github.com:HabitRPG/habitrpg into common-convert
2015-02-03 19:26:58 -06:00
Blade Barringer
6f4fbfeaeb
Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
...
Conflicts:
common/img/sprites/spritesmith/npcs/npc_ian.png
common/img/sprites/spritesmith/npcs/seasonalshop_winter2015.png
dist/habitrpg-shared.css
dist/habitrpg-shared.js
dist/spritesmith1.css
dist/spritesmith1.png
dist/spritesmith2.css
dist/spritesmith2.png
dist/spritesmith3.css
dist/spritesmith3.png
dist/spritesmith4.css
dist/spritesmith4.png
2015-02-03 19:26:14 -06:00
Blade Barringer
14e5f475ab
Moved config back
2015-02-03 16:58:03 -06:00
Blade Barringer
393d614c7f
Moved scirpts back in place
2015-02-03 16:56:50 -06:00
Blade Barringer
f5f1964249
Started organizing common folder
2015-02-01 23:09:07 -06:00
Blade Barringer
88be8f3274
Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
...
Conflicts:
common/img/sprites/spritesmith/misc/inventory_quest_scroll_penguin.png
common/img/sprites/spritesmith/npcs/npc_bailey_broken.png
common/img/sprites/spritesmith/npcs/npc_justin_broken.png
common/img/sprites/spritesmith/npcs/npc_matt_broken.png
img/sprites/spritesmith/gear/events/birthday/broad_armor_special_birthday2015.png
img/sprites/spritesmith/gear/events/birthday/shop_armor_special_birthday2015.png
img/sprites/spritesmith/misc/inventory_quest_scroll_penguin.png
img/sprites/spritesmith/npcs/npc_bailey_broken.png
img/sprites/spritesmith/npcs/npc_justin_broken.png
img/sprites/spritesmith/quests/inventory_quest_scroll_penguin.png
2015-02-01 14:07:18 -06:00
Blade Barringer
c91b0cd34a
Moved folders into common directory
2015-01-21 10:34:04 -06:00
