Commit Graph

175 Commits

Author SHA1 Message Date
Blade Barringer 53c466ee7f Rounds tooltip for exp, health and mana to 2 decimal places 2015-01-06 13:52:22 -06:00
Jackson Popkin b409e589f1 Add tooltip with exact health/exp/mana 2015-01-04 17:26:11 -05:00
Sabe Jones eadedd5897 Merge pull request #4383 from SabreCat/seasonal
Seasonal Shop Basics
2014-12-16 21:51:02 -06:00
Blade Barringer d56eb1eeeb Added last guild link, corrected hall links 2014-12-14 20:10:42 -06:00
Blade Barringer 63c2248b38 Corrected guild links 2014-12-14 20:07:46 -06:00
Sabe Jones 071ac02ec2 chore(git): Resolve merge conflict 2014-12-14 14:55:37 -06:00
Sabe Jones 867f50b514 fix(seasonal): Add menu item 2014-12-14 14:12:20 -06:00
Sabe Jones 8cd1ea48db fix(I18N): Remove more hardcoded text 2014-12-14 14:10:39 -06:00
Sabe Jones 6dcbd329a5 fix(seasonal): Typo in string resource 2014-12-14 14:05:43 -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 29f693cd24 fix(I18N): Remove hardcoded text 2014-12-14 13:55:40 -06:00
Sabe Jones 506c396baf fix(I18N): Translate TT in menu 2014-12-14 13:53:00 -06:00
Blade Barringer 7fb1e69927 Changed inbox text to use an env.t var 2014-12-10 10:47:05 -06:00
Tyler Renelle 0fffd66588 feat(plans): time travelers tab, 1 trinket to buy 1 set 2014-12-03 14:17:08 -07:00
Tyler Renelle 66b4dae0d9 feat(news): move old news to /static/old-news, better use of content space 2014-12-03 13:49:24 -07:00
Tyler Renelle 3204418af1 Revert #4291
This reverts commit a1ea6869b7.
2014-11-29 09:16:44 -07:00
Tyler Renelle e63f2b6d97 Merge remote-tracking branch 'remotes/Alys/eyewear1' into develop
Conflicts:
	database_reports/count_users_who_own_specified_gear.js
2014-11-29 08:33:28 -07:00
Blade Barringer 9a1b209da1 Corrected indentation error 2014-11-28 19:41:11 -06:00
Steffen Breiler a1ea6869b7 Fix #4259 (always 100% long bars in IE11)
Fix issue with IE11 displaying Bars with full length (style: width is ignored) by using ng-style instead of plain style.
Fixes health, level and mana bar.
2014-11-27 22:47:52 +01:00
Alice Harris 19fb81aafd Merge pull request #4248 from crookedneighbor/add-uuid-to-user-data-link
Added uuid parameter to data link
2014-11-22 12:08:51 +10:00
Tyler Renelle f5415ac6c5 feat(private-messages): start implementing private messaging (includes blocking). Start experimenting with reflists for PMs, instead of arrays 2014-11-20 19:03:01 -07:00
Tyler Renelle 487f8afe30 feat(help): add tour to help menu 2014-11-18 12:00:33 -08:00
Blade Barringer 4d08bb9206 Added uuid parameter to data link 2014-11-16 16:05:32 -06:00
Tyler Renelle 114cbe2760 Merge pull request #4236 from HabitRPG/share-avatar
Share avatar
2014-11-12 14:42:48 -07:00
Tyler Renelle 15f318ccc2 feat(sharing): screw it, social links + img + text aint working, just
redirect to homepage + show member modal
2014-11-11 19:12:02 -07:00
Tyler Renelle 3e21e1f448 feat(sharing): implement caching of avatar img. img as image/png instead
of octet/stream
2014-11-11 19:12:02 -07:00
Tyler Renelle 69da58503a feat(sharing): move avatar-sharing to herobox, use addthis instead of
custom solution. refactor from pages/* to export/*
2014-11-11 19:11:49 -07:00
ShilohT 54c913a5a8 Update menu.jade
Added 'Data' menu item
2014-11-10 02:21:49 -05:00
Brian Chen 9ecbe9d48f Add unallocated attribute points notification
* Uses i18n "haveUnallocated" string, to come in another commit
2014-10-04 19:57:30 +08:00
Brian Chen 74be4b211b DRY-refactor notification display conditions
* Condense the different notification icons into one span with a
  dynamically selected ng-class.
* Move logic for determining which notification icon to show and whether
  there are no notifications into AuthCtrl.
* Refactor out the two similar sequences of logic conditions into a
  helper function.
2014-10-04 17:56:56 +08: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
Alice Harris 9cf76f0deb fix whitespace 2014-09-05 21:07:57 +10:00
Alice Harris c731753e33 add Help menu 2014-09-05 20:57:44 +10:00
Negue f7d0c91471 fix tooltip .. again 2014-08-29 20:51:12 +02:00
Alice Harris 95b16f8690 change headAccessory to eyewear 2014-08-29 18:51:28 +10:00
Alice Harris 581b921ae1 revert https://github.com/HabitRPG/habitrpg/pull/3920 because it causes level tooltip to hide Buffed and Rebirth tooltips 2014-08-26 15:49:59 +10:00
Negue 0ddcea95f1 fix level tooltip 2014-08-25 19:04:03 +02:00
Matteo Pagliazzi 4c8309c8cc fix(jade): fix warings 2014-08-17 13:32:09 +02:00
Tyler Renelle 39911ef8e0 feat(audio): refactor user.preferences.{sound,soundTheme} into just
user.preferences.sound. Fix audio dropdown bug by moving to list-items instead
2014-08-15 18:13:59 -06:00
Adrien Lemaire d7aaec2262 fix bug switch audio wasn't working 2014-08-09 18:57:17 +09:00
Adrien Lemaire dcbd460331 fix audio menu style 2014-08-09 16:58:49 +09:00
Adrien Lemaire 2cf8083693 improving music menu 2014-08-08 23:37:04 +09:00
Adrien Lemaire 3d2d8fbfef clean branch from develop to add audio 2014-08-08 23:03:52 +09:00
deilann 0871dd074c Merge pull request #3837 from vIiRuS/patch-4
display avatar with closed eyes when sleeping
2014-08-04 16:41:25 -07:00
benmanley a6d101202c fix(avatar.jade): change .notBackground to .noBackgroundImage
avatar.jade was applying a class of .notBackground, but the css in
avatar.styl used .noBackgroundImage.

* Changed .notBackground to .noBackgroundImage in avatar.jade and
avatar.styl
* Consolidated css and added more comments
* Amended spacing as Stylus wasn’t compiling correctly
* Removed #profileStable and .pet css as couldn’t find reference to
them anywhere else.
* Commented out styles indicating who is party leader for now. Need a
solution that doesn’t involve background color.
2014-08-04 22:45:10 +01:00
Phillip Thelen 49d056fe14 display avatar with closed eyes when sleeping
Display the sleeping version, when users are in the inn.

CAUTION: For this to work, this pull request will have to be merged first: https://github.com/HabitRPG/habitrpg-shared/pull/269
Otherwise the _sleep images are missing. ;)
2014-08-03 20:39:09 +02:00
Alice Harris a87b651caf apply contributor tier color to avatar name 2014-07-29 08:53:23 +10:00
Alice Harris 1e797a0b05 show more avatar background (remove Lvl, hide avatar name) 2014-07-27 08:41:33 +10:00
benmanley 190ef0402c refactor(avatar): restyle level label 2014-07-03 16:22:51 +01:00
benmanley 15a63d6e66 refactor(.hero-stats): re-restyle status meters
Improved status meter design based on user feedback
2014-07-03 16:10:18 +01:00