Commit graph

10112 commits

Author SHA1 Message Date
Sabe Jones
d32d05e873 feat(mystery): July 2015 goodies
Also makes the mystery box opening notification translatable and adds item graphics to it.
2015-07-23 12:05:13 -05:00
Blade Barringer
bfd56b35e1 Revert armoire counting code back to old system
@TODO: work out why it's hpapening and unpend test for new system
2015-07-23 08:43:08 -05:00
Alys
c3e2b92546 add all the files I forgot to add for 02cccb01ef (blank placeholder image for collection quests, partial fix for #4936) 2015-07-23 13:58:38 +10:00
Blade Barringer
36a082f4ef chore(i18n): update locales 2015-07-22 21:51:17 -05:00
Blade Barringer
d8434a5512 chore(i18n): update locales 2015-07-22 21:24:10 -05:00
Blade Barringer
8a363efc43 Merge branch 'develop' into TheHollidayInn-pet-actions-esc-to-cancel 2015-07-22 17:59:50 -05:00
Blade Barringer
f876988cb9 Merge pull request #5642 from crookedneighbor/refactor_member_modal_and_stats_page
Refactor member modal and stats page
2015-07-22 17:46:57 -05:00
Blade Barringer
c41271e558 Merge branch 'develop' into refactor_member_modal_and_stats_page 2015-07-22 17:39:39 -05:00
Blade Barringer
7b9102c88c Move gear counting to counting script 2015-07-22 17:37:35 -05:00
Blade Barringer
f40cfd2b66 Move all pet counting to shared count scripts 2015-07-22 17:32:12 -05:00
Sabe Jones
0f1c92184c chore(news): iOS update Bailey 2015-07-22 15:42:35 -05:00
TheHollidayInn
c61eccaaba Removed if statements and fixed style issues 2015-07-22 15:38:17 -05:00
Sabe Jones
7d622792a8 Merge pull request #5635 from HabitRPG/sabrecat/quests-page
Improve quest drop notification
2015-07-22 10:28:16 -07:00
Sabe Jones
6d52f842ff fix(quest): Move party jump to cb 2015-07-22 11:52:15 -05:00
Blade Barringer
de30d6bf0c chore(i18n): update locales 2015-07-22 07:41:49 -05:00
Alys
02cccb01ef add blank placeholder image for collection quests that don't have quest box artwork - partial fix for https://github.com/HabitRPG/habitrpg/issues/4936 2015-07-22 20:48:06 +10:00
TheHollidayInn
107e27a2c6 Deselect food, egg, and potion when hitting the escape key 2015-07-21 21:52:29 -05:00
Blade Barringer
063e53b0ea Added function to count pets that are actually owned 2015-07-21 20:14:15 -05:00
Blade Barringer
20660f50c0 Add count function for remaining items in gear set 2015-07-21 18:06:07 -05:00
Sabe Jones
0313170921 feat(quests): Invite party button 2015-07-21 15:25:34 -05:00
Blade Barringer
73e1764413 Move beast/mount master counts to separate file 2015-07-21 08:13:50 -05:00
Sabe Jones
632faafa4f fix(quests): Refactoring
Based on feedback from @crookedneighbor and @gisikw. Removes double ternary in the block that normalizes the item type string, and reverts the notification logic to if/else if format instead of switch/case. Also removes a block of commented-out code once used for death notifications.
2015-07-20 14:17:35 -05:00
Blade Barringer
65c14b1e3f Refactor inventory ctrl variables 2015-07-20 12:51:10 -05:00
Blade Barringer
3d40da4004 Remove countPets and countMounts from codebase 2015-07-20 08:11:00 -05:00
Blade Barringer
610f7faa5c Add test for count beast/mount master progress 2015-07-20 08:04:03 -05:00
Blade Barringer
2695419182 Use better beastMaster / mountMaster counts 2015-07-19 21:51:30 -05:00
Blade Barringer
3643d11d97 Refactor pet and mount count into one method 2015-07-19 20:56:14 -05:00
Blade Barringer
aee37b2a0e Swap out pet and mount count with stat calc functions 2015-07-19 20:40:15 -05:00
Blade Barringer
89bfc83b95 Organize stat functions alphabetically 2015-07-19 20:19:16 -05:00
Blade Barringer
11f56d491c Remove close button from menu
Closes #3820
2015-07-19 19:08:48 -05:00
Blade Barringer
a139ca8ba5 Merge branch 'develop' into refactor_member_modal_and_stats_page 2015-07-18 17:10:04 -05:00
Blade Barringer
dc2fab14d0 Merge branch 'GitHubSphinx-Sphinx-i18n-db1' into develop 2015-07-18 17:06:26 -05:00
Blade Barringer
4f5626b73b Merge branch 'hairlessbear-fix-ian-popover' into develop 2015-07-18 17:00:32 -05:00
Blade Barringer
4e6c2e7335 Add missing classes 2015-07-18 16:59:54 -05:00
Blade Barringer
4cff85784d Move stats to separate partials 2015-07-18 16:00:09 -05:00
Blade Barringer
9994b27f1e Fix member modal on static/front 2015-07-18 16:00:09 -05:00
Blade Barringer
d44dbef859 Move member modal controller to own file 2015-07-18 16:00:08 -05:00
Blade Barringer
b716d882b6 Began refactor of stats page 2015-07-18 16:00:08 -05:00
Blade Barringer
c784b97586 Create private method for how stats should be displayed 2015-07-18 16:00:08 -05:00
Blade Barringer
53fb0ec8b0 Add display experience function 2015-07-18 16:00:07 -05:00
Blade Barringer
f1453d30c4 Add gold display function 2015-07-18 16:00:07 -05:00
Blade Barringer
2eb62de056 Add mpdisplay function 2015-07-18 16:00:07 -05:00
Blade Barringer
17ef7e2885 Add hpDisplay function 2015-07-18 16:00:06 -05:00
Blade Barringer
f9304bd28f Move stat calc scripts to angular service 2015-07-18 16:00:06 -05:00
Blade Barringer
3926a6e95a Remove unnecssary semicolons 2015-07-18 16:00:06 -05:00
Blade Barringer
94d476f837 Correct method name 2015-07-18 16:00:06 -05:00
Blade Barringer
ff42505d1b Add string 2015-07-18 16:00:05 -05:00
Blade Barringer
2b4e48fbe6 Add stat calc to common 2015-07-18 16:00:05 -05:00
Blade Barringer
20148be288 Watch js files in common folder 2015-07-18 16:00:05 -05:00
Blade Barringer
163b0545e8 Adjustments for error handling 2015-07-18 16:00:04 -05:00