Commit graph

94 commits

Author SHA1 Message Date
Blade Barringer
0807e7856c Merge remote-tracking branch 'upstream/develop' into mountmaster 2015-01-08 11:31:45 -06:00
Blade Barringer
f0c65be629 Fix to allow for challenges with the same award name. Closes #4479 2015-01-05 17:15:33 -06:00
Blade Barringer
45c045e853 Corrected which string was being used in achievements 2015-01-02 14:16:40 -06:00
Blade Barringer
e2403c52ad Converted more ng-shows to ng-ifs 2015-01-01 21:24:21 -06:00
Blade Barringer
f2d62784f4 Converted ng-show to ng-if 2015-01-01 21:23:39 -06:00
Blade Barringer
e219c0d110 Corrected mountmasterProgress variable name 2015-01-01 21:23:05 -06:00
Blade Barringer
08d13660fb Hid mounts area in stats until dropx enabled 2015-01-01 21:21:53 -06:00
Blade Barringer
04a12542e5 Corrected the achievemnts page to show the right medal for mountmaster 2015-01-01 21:17:58 -06:00
Blade Barringer
7172df7dbb Corrected second half of mountmaster text to only show if mountmaster
has been achieved at least once
2014-12-31 16:46:13 -06:00
Blade Barringer
0fd3f290b8 Merge branch 'develop' into mountmaster 2014-12-31 13:14:11 -06:00
Sabe Jones
438516b26f fix(NYE): Correct achievement badge 2014-12-30 22:56:40 -06:00
Sabe Jones
d8cfc1dd4b WIP(NYE): New Year's cards 2014-12-29 20:58:28 -06:00
Blade Barringer
6f459f33e4 Added fields for total pet/mount count as well as achievment progress 2014-12-11 10:09:09 -06:00
Taldin
506ac6ebe7 added mountmaster support
inventoryCtrl: Changed Matt to show 90 mounts instead of 180
notificationCtrl: added mountmaster achievement test
userCtrl: added scope.profile.mountCount
user.js: added fields for mountMaster and mountMasterCount (not used
yet),  mountCount function
modals/achievements.jade - added modal dialog for mountmaster (note:
wolf graphic was not available locally)
profiles/achievements - jade  - mountmaster added
stats.jade -- uncommented broken Mounts Tamed section, since it works
now
2014-10-30 12:35:40 -07:00
Tyler Renelle
fd18232187 bailey(): mystery, costume challenge 2014-10-24 20:33:51 -06:00
Tyler Renelle
0841cafd1f feat(spookDust): add the spookDust special spell, like snowballs. Note: this is handled specially so spookDust can be bought with GP, is a WIP 2014-10-02 23:18:13 -06:00
deilann
8427c53d90 release pets feature 2014-09-29 13:35:38 -07:00
Tyler Renelle
b946338184 feat(dilatory): add dilatory achievement 2014-07-17 18:37:09 -06:00
Tyler Renelle
3b0a22409e perf(achievements): bindonce on achievements 2014-06-25 13:34:08 -06:00
Tyler Renelle
6fdec4a146 refactor(stats): iterate stats via jade instead of angular. needed for some mobile stuff 2014-06-17 16:30:13 -06:00
Gaelan
8bd9f3d348 Fix stats.jade.
I broke it in a previous PR.
2014-06-09 22:51:28 -07:00
Bob Example
33a3958a2c Stop using abbreviated names of attributes in UI. 2014-06-09 17:29:51 -07:00
Matteo Pagliazzi
304beb6482 fix(i18n): use strings 2014-05-12 17:15:38 +02:00
Tyler Renelle
e60cf01b6f feat(stats): expos stats jade files to mobile 2014-05-08 16:04:36 -06:00
Matteo Pagliazzi
52d2693d94 fix(i18n): use translated attributes and classes 2014-05-06 20:05:57 +02:00
Matteo Pagliazzi
e4f8ee1b93 fix(i18n): spacing 2014-05-06 20:04:10 +02:00
Matteo Pagliazzi
d242ee3291 refactor(i18n): use strings for content 2014-05-06 20:04:09 +02:00
SabreCat
ef5b7deff3 fix(achievements): Differentiate singular and plural
Allows Streak and Perfect Day achievements to dynamically show a singular or plural version of their text based on how many achievements the viewed profile has stacked.

BREAKING CHANGE: Will lead to 'string not found' errors until the singular version strings are implemented in all locales on habitrpg-shared.
2014-04-27 21:36:21 -05:00
Tyler Renelle
c7f7a07aed chore(ultimateGear): take ultimategear offline until it's fixed (see https://github.com/HabitRPG/habitrpg/issues/2232) 2014-03-30 18:20:05 -06:00
Marc-André Larivière
dc75834ec4 Changed hints style (and small quick fixes) 2014-02-16 10:13:16 -05:00
Tyler Renelle
fd6eb8724e feat(valentine): valentine event 2014-02-13 18:40:33 -07: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
Matteo Pagliazzi
1a44c3cf0c refactor(bs3): css 2014-02-09 16:16:43 +01:00
Matteo Pagliazzi
0fe0cb4f2d refactor(bs3): labels style and text, buttons classes 2014-02-08 16:27:34 +01:00
Matteo Pagliazzi
5d4d82ad51 refactor(bs3): port options (profile, inventory, social (groups and hall)) and misc 2014-02-05 19:05:42 +01:00
Matteo Pagliazzi
56133894d8 refactor(bs3): sync with develop 2014-02-03 18:45:25 +01:00
Sabe Jones
4f911a68d8 fix(buffs): Move help bubble to left of special buffs
Corrects an issue where the popover text for Stealth and Chilling Frost inherited the "strong" formatting of the buff name label, and improves visual consistency with the attribute readout above them.
2014-02-02 21:19:01 -06:00
Matteo Pagliazzi
cc348b2f11 refactor(bs3): sync with develop & misc 2014-01-31 20:04:40 +01:00
Matteo Pagliazzi
0764aa8c17 refactor(bs3): convert icons to new format 2014-01-31 19:47:48 +01:00
Tyler Renelle
aff885c05c feat(habitBirthday): add habitrpg birthday event. includes cakes for all
pets, absurd party robes, npc swap, badge, etc. @lemoness
2014-01-30 19:20:07 -07:00
Matteo Pagliazzi
4274090205 fix(translations): fix #2564 and similar ones 2014-01-26 14:48:38 +01:00
Matteo Pagliazzi
8e99186e9c refactor(translations): achievements 2014-01-24 20:07:02 +01:00
Tyler Renelle
518f200a8f fix(#2375) merge in @SabreCat's stats.jade changes "More elegant
show/hide setup for attribute bonuses"
2014-01-15 22:15:26 -07:00
Tyler Renelle
e66fdd80ef feat(perfect-day achievement) 2014-01-15 16:24:23 -07:00
Matteo Pagliazzi
2e12ffefc6 revert previous change 2014-01-15 16:56:40 +01:00
Matteo Pagliazzi
178086ef30 fix some translation strings 2014-01-15 16:54:37 +01:00
Marcelo Sizer
6cc7d73683 Replace old stats.jade file 2014-01-14 17:06:16 -02:00
Marcelo Sizer
1b1c646e24 Replace old code 2014-01-14 16:22:14 -02:00
Marcelo Sizer
e7307681d3 Replace old code 2014-01-14 16:19:37 -02:00
Marcelo Sizer
20277e623e Add @paglias suggested fixes 2014-01-14 16:16:40 -02:00