Commit Graph

546 Commits

Author SHA1 Message Date
benmanley d7fd365a59 Remove top level tabbed navigation and gem wallet 2014-04-03 09:21:42 +01:00
Sabe Jones 450a4e4ff5 feat(market): Implement Deer egg purchase
Adds the Ghost Stag quest to the list of pet quests that unlock egg purchases in Market after 2 completions.
2014-03-21 22:53:19 -05:00
Tyler Renelle 239e8abf68 feat(equipment): remove base gear from equipment. index.coffee is now
such that when you click the same gear you have equipped, it un-equips.
2014-03-21 15:03:46 -06:00
Tyler Renelle 531fe5eb31 feat(flower): add flower customization option 2014-03-21 12:29:57 -06:00
sabrecat 7102943aa1 feat(quests): Allow purchase of quest pets
Implements purchase in the Market of the two currently available pet quest eggs, after the user has completed the corresponding quest at least twice. This is a hard-code solution; @lefnire or others a little more adept in Angular might be able to make this generic and extensible with an ng-repeat--I just couldn't get the expression quite right.
2014-03-17 12:20:27 +00:00
Sabe Jones d62d94c4fc WIP: Enable quest eggs in Market after two runs 2014-03-16 22:23:23 -05:00
Tyler Renelle 4814f479a4 Merge pull request #2874 from lorian/inn-text
Added a second message under the "rest at the inn" button, explaining ho...
2014-03-09 16:51:28 -06:00
Sabe Jones ff3f1c590c fix(bosses): Use ceiling rounding for boss HP
Corrects the issue reported by some users where boss HP shows 0 but they're not actually defeated yet. Man, Angular "number" directive, why you gotta round like that?
2014-02-28 19:07:57 -06:00
Tyler Renelle 748f76b928 Merge pull request #2808 from deilann/createparty
adding pertinent info to create party
2014-02-27 09:35:55 -08:00
Sabe Jones 39380507e7 fix(Market): Move Saddle back with food
Moves Saddle out of the Special category of the Market into the "Food and Saddles" group, to match up with the label and grouping used elsewhere.

Fixes #2937
2014-02-25 19:23:57 -06:00
Matteo Pagliazzi c41097b6ec fix(i18n): remove duplicate string 2014-02-24 18:35:48 +01:00
Tyler Renelle 13094c127a feat(premium): unlock mystery items within timeframe of sub sign-on 2014-02-22 21:43:44 -08:00
Tyler Renelle 91d8ebad6d feat(premium): add mystery-item gear slot 2014-02-22 20:38:16 -08:00
Matteo Pagliazzi 35a997c690 Merge pull request #2917 from benmanley/stable-styles
Move CSS for pets that have been raised into mounts from stable.jade to inventory.styl
2014-02-22 15:25:01 +01:00
Tyler Renelle a8e890a6df feat(premium): mystery items 2014-02-21 17:37:37 -08:00
benmanley 8c2c940d88 Move styles from stable.jade to inventory.styl file 2014-02-21 12:49:46 +00:00
benmanley c04caefaac Fix positioning of paw sprites 2014-02-21 12:49:46 +00:00
James Hsiao 9fe8da3c12 fix space issues: contrib modal, challenge list 2014-02-20 20:33:10 -05:00
Tyler Renelle 02c283b628 chore(Merge): remote-tracking branch 'marcgenesis/develop' into develop
Conflicts:
	views/options/settings.jade
2014-02-20 16:34:28 -08:00
Tyler Renelle 67876d6306 fix(views): indentation issue, fixes #2913 2014-02-20 12:27:59 -08:00
Hsiao, James (CMG-Atlanta) 0690e1db5a added mysteryItem listing under subscriptions 2014-02-20 11:28:01 -05:00
Lorian 94480d8cdb Added a second message under the "rest at the inn" button, explaining how the inn interacts with boss fights. 2014-02-17 13:43:27 -08:00
Marc-André Larivière dc75834ec4 Changed hints style (and small quick fixes) 2014-02-16 10:13:16 -05:00
Matteo Pagliazzi 4018ec885b fix(header): use strings and a small css fix 2014-02-16 14:51:48 +01:00
deilann 18c3460ba8 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into createparty 2014-02-15 06:46:12 -08:00
Matteo Pagliazzi 8f19f225f1 fix(misc): some styles & translations 2014-02-14 18:35:21 +01:00
Tyler Renelle fd6eb8724e feat(valentine): valentine event 2014-02-13 18:40:33 -07:00
Matteo Pagliazzi fef858d555 refactor(caching): cache emojis and remove gemoji from bower 2014-02-12 15:21:40 +01:00
Matteo Pagliazzi fa2c64d2d8 chore(i18n): prepare english for transifex: remove ending or starting space & _comment strings 2014-02-11 19:30:55 +01:00
Tyler Renelle ffb42906e1 feat(event-tracking): start adding some client-side GA event-tracking 2014-02-10 11:33:40 -07:00
deilann e653d85cb7 adding pertinent info to create party 2014-02-10 05:37:31 -08:00
Matteo Pagliazzi a7e3e76daa refactor(bs3): add fixed height modals & panels for quests & group members 2014-02-09 16:29:16 +01:00
Matteo Pagliazzi 3f28d16478 refactor(bs3): add fixed height modals & panels 2014-02-09 16:25:10 +01:00
Matteo Pagliazzi 1a44c3cf0c refactor(bs3): css 2014-02-09 16:16:43 +01:00
Matteo Pagliazzi 5874941b94 refactor(bs3): inventory & misc 2014-02-09 12:32:12 +01:00
Lorian 322b257b72 Separated stable into dropped pets, quest pets, and rare pets, and made countPets only count the former. Made countMounts only count dropped and quest-hatched mounts, not rare mounts. 2014-02-08 16:57:28 -08:00
Matteo Pagliazzi f3c42f19ab refactor(bs3): hall form 2014-02-08 20:07:37 +01:00
Matteo Pagliazzi b4be88f4e0 refactor(bs3): misc 2014-02-08 19:49:47 +01:00
Matteo Pagliazzi 9ea9ed841d refactor(bs3): buyQuest fix, add back badges colors, minor fixes 2014-02-08 19:20:10 +01:00
Matteo Pagliazzi ee871ccb01 refactor(bs3): fixes 2014-02-08 16:58:41 +01:00
Matteo Pagliazzi 0fe0cb4f2d refactor(bs3): labels style and text, buttons classes 2014-02-08 16:27:34 +01:00
Tyler Renelle 313ec3d869 Merge branch 'develop' into bs3
Conflicts:
	views/options/social/tavern.jade
2014-02-07 23:41:14 -07:00
Tyler Renelle 5db96ebca2 fix(bs3): port pet feeding bar 2014-02-07 21:57:26 -07:00
deilann 25941623b1 putting in issue ticket
correctly putting in issue ticket for "report a bug"
2014-02-07 17:44:56 -08:00
Tyler Renelle 3473b73452 chore(Merge): branch 'develop' into bs3
Conflicts:
	views/options/inventory/inventory.jade
2014-02-07 17:42:12 -07:00
Tyler Renelle d034262834 feat(premium): subscriber mystery item (doesn't yet do anything) 2014-02-07 11:40:34 -07:00
Tyler Renelle 82d9233d99 feat(rainbow-hair): add rainbow hair colors 2014-02-07 10:01:31 -07:00
Tyler Renelle ce8351d622 chore(Merge): branch 'develop' into origin-paglias-bs3
Conflicts:
	views/options/social/tavern.jade
2014-02-07 00:03:33 -07:00
deilann 66c7f48e2b updating LFG
Updating Looking for Group to the proper (not dead) link.
2014-02-06 11:37:35 -08:00
Matteo Pagliazzi e4bd817443 refactor(bs3): sync with develop 2014-02-06 17:36:33 +01:00