Commit graph

179 commits

Author SHA1 Message Date
Blade Barringer
8a8ce8d80d Moved folders to website directory 2015-02-03 14:10:55 -06:00
Blade Barringer
d3d12bc638 Added popover-append-to-body to inventory popovers 2015-01-28 14:23:38 -06:00
Blade Barringer
84552597d6 Adjusted hrs for popovers 2015-01-28 14:00:06 -06:00
Blade Barringer
4c6bf8f543 Added append to body to quest scroll popovers 2015-01-28 13:37:34 -06:00
Blade Barringer
b56c5af978 Changed popover text for quest scrolls. Closes #4575 2015-01-27 19:32:06 -06:00
Blade Barringer
58650baba3 Merge branch 'issue#4556' of https://github.com/matttelliott/habitrpg into border 2015-01-27 09:10:46 -06:00
Matt T Elliott
2c40097403 move from left div to right 2015-01-26 23:14:19 -08:00
Blade Barringer
b9784fa4aa Added notice for rebirth in seasonal shop 2015-01-26 22:15:24 -06:00
Blade Barringer
7eae5db256 Added comment describing the silly conditional for transparency in the
seasonal shop
2015-01-26 19:25:53 -06:00
Blade Barringer
3b1743dee8 Corrected ng-class condition to show transparent class
on seasonal shop items after rebirth
2015-01-26 18:55:10 -06:00
Sabe Jones
412417505f feat(quests): Differentiated scrolls
Implements logic to show specific scroll images per quest, falling back to the present scroll image if none is present. Also implements a "locked scroll" picture for unavailable quests in addition to the current background dimming.
2015-01-23 10:40:32 -06:00
Blade Barringer
10bc7e4eac Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster 2015-01-16 10:44:52 -06:00
Sabe Jones
0b63e48c6e feat(quest): T-Rex pet
Includes news announcements for 1/15/2014, Market implementation for T-Rex dual quest, and the ability for "healing" type Rage meters to work in party-scale boss fights.
2015-01-15 15:38:51 -06:00
Blade Barringer
0807e7856c Merge remote-tracking branch 'upstream/develop' into mountmaster 2015-01-08 11:31:45 -06:00
Blade Barringer
f3676fcbf4 Added spaces between quantity and gem symbol 2015-01-05 13:33:43 -06:00
Blade Barringer
1049e5e152 Key shows up when you have either 90 pets or 90 mounts. Opens lg modal 2015-01-02 13:08:45 -06:00
Sabe Jones
3a0de8f9c4 chore(January): news and deactivate cards 2015-01-01 23:20:59 -06:00
Sabe Jones
d1355faa31 Merge pull request #4452 from SabreCat/nye
New Year's event features
2014-12-30 22:18:11 -06:00
Sabe Jones
51acc477fe feat(NYE): New Year's cards 2014-12-30 19:57:24 -06:00
Blade Barringer
303d30a270 Merge pull request #4439 from crookedneighbor/transparent-gems
Added transparent class to gem purchasing if zero gems are available for purchase
2014-12-30 11:11:32 -06:00
Sabe Jones
d8cfc1dd4b WIP(NYE): New Year's cards 2014-12-29 20:58:28 -06:00
Sabe Jones
53fff0dbc6 feat(seasonal): Implement Snowball
Adds the snowball from Winter 2014 to the Seasonal Shop.
2014-12-29 19:40:11 -06:00
Blade Barringer
4eca27f19e Corrected class name closes #4434 2014-12-29 19:15:51 -06:00
Blade Barringer
760381041f Added transparent class to gem purchasing if zero gems are available for purchase 2014-12-29 11:18:01 -06:00
Melissa Mcewen
f8cdcd2e75 Inconsistent alignment of Gem prices in Seasonal Shop #4434 2014-12-28 23:35:47 -06:00
Negue
a082e88b5d Filter Array only once and one time binding - closes #4429 2014-12-27 23:26:30 +01:00
Blade Barringer
72d4bf2bf5 Merge pull request #4423 from andyzinsser/fix-no-food-text-color
Add muted class when no food is in inventory
2014-12-26 20:47:15 -06:00
Andy Zinsser
db6f52e4b5 Add muted class when no food is in inventory 2014-12-26 18:31:21 -08:00
Blade Barringer
f5a0bd6903 Added trasnparent class to seasonal items already owned 2014-12-25 21:32:07 -06:00
Sabe Jones
1b4843ff58 fix(event): Better quest text placement 2014-12-25 17:42:09 -06:00
Sabe Jones
f4c582eb24 fix(event): quest syntax 2014-12-25 17:40:49 -06:00
Sabe Jones
597793e3ca feat(event): Quests and Bailey 2014-12-25 17:36:16 -06:00
Sabe Jones
1c90886548 fix(event): Better shop flow 2014-12-25 15:52:26 -06:00
Sabe Jones
0e28f04c90 feat(event): Implement Seasonal Shop 2014-12-25 14:33:11 -06:00
thehindenburg
1675bb26b2 change link in gala page to gala wiki 2014-12-19 07:47:28 -08:00
Sabe Jones
8ff0a4a4a4 fix(seasonal): Leslie link 2014-12-17 18:27:37 -06:00
Sabe Jones
9f46e14cd6 fix(seasonal): missing bang 2014-12-14 14:18:57 -06:00
Sabe Jones
7988dfcf82 fix(seasonal): Corrections for Shop
Fix Jade indenting, add state control, add menu option
2014-12-14 14:01:25 -06:00
Sabe Jones
a98a685971 feat(seasonal): Seasonal Shop
Initial commit of frontend for Seasonal Shop feature.
2014-12-14 13:37:32 -06:00
Sabe Jones
dc034e4ab5 fix(quest): Add penguin to shop 2014-12-09 20:48:08 -06:00
Andy Mantell
58359f1e89 Link for Tyler and Vicky's names #4351 2014-12-06 15:42:12 +00:00
Blade Barringer
ae62a04497 Converted planId to customerId on whether or not gems can be purchased.
Closes #4340
2014-12-05 15:53:53 -06:00
Matteo Pagliazzi
0450e2b924 Revert "Revert "Tranlsate mystic items"" 2014-12-05 16:07:27 +01:00
Matteo Pagliazzi
1d1de38956 Revert "Tranlsate mystic items" 2014-12-05 16:03:41 +01:00
Matteo Pagliazzi
a1075a5193 Merge pull request #4329 from crookedneighbor/tranlsate-mystic-items
Tranlsate mystic items
2014-12-05 16:02:34 +01:00
Sabe Jones
7dd16a06e6 Revert "fix(style): Make pet key a SPAN"
This reverts commit 63ea851fdb.
2014-12-04 20:26:50 -06:00
Sabe Jones
63ea851fdb fix(style): Make pet key a SPAN 2014-12-04 20:13:26 -06:00
Blade Barringer
5986643f1e Corrected strings so they only use one variable 2014-12-04 20:03:31 -06:00
Blade Barringer
532f5d1c53 Converted strings to be able to use links 2014-12-04 19:49:36 -06:00
Blade Barringer
21ca49345d Moved time travelers and hourglass strings to shared 2014-12-04 19:49:36 -06:00