8a363efc43
Merge branch 'develop' into TheHollidayInn-pet-actions-esc-to-cancel
2015-07-22 17:59:50 -05:00
7b9102c88c
Move gear counting to counting script
2015-07-22 17:37:35 -05:00
c61eccaaba
Removed if statements and fixed style issues
2015-07-22 15:38:17 -05:00
107e27a2c6
Deselect food, egg, and potion when hitting the escape key
2015-07-21 21:52:29 -05:00
063e53b0ea
Added function to count pets that are actually owned
2015-07-21 20:14:15 -05:00
20660f50c0
Add count function for remaining items in gear set
2015-07-21 18:06:07 -05:00
73e1764413
Move beast/mount master counts to separate file
2015-07-21 08:13:50 -05:00
3d40da4004
Remove countPets and countMounts from codebase
2015-07-20 08:11:00 -05:00
610f7faa5c
Add test for count beast/mount master progress
2015-07-20 08:04:03 -05:00
2695419182
Use better beastMaster / mountMaster counts
2015-07-19 21:51:30 -05:00
3643d11d97
Refactor pet and mount count into one method
2015-07-19 20:56:14 -05:00
aee37b2a0e
Swap out pet and mount count with stat calc functions
2015-07-19 20:40:15 -05:00
89bfc83b95
Organize stat functions alphabetically
2015-07-19 20:19:16 -05:00
53fb0ec8b0
Add display experience function
2015-07-18 16:00:07 -05:00
f1453d30c4
Add gold display function
2015-07-18 16:00:07 -05:00
2eb62de056
Add mpdisplay function
2015-07-18 16:00:07 -05:00
17ef7e2885
Add hpDisplay function
2015-07-18 16:00:06 -05:00
f9304bd28f
Move stat calc scripts to angular service
2015-07-18 16:00:06 -05:00
163b0545e8
Adjustments for error handling
2015-07-18 16:00:04 -05:00
6d5b57d139
Add class bonus calc function
2015-07-18 16:00:04 -05:00
e5428f29c1
Add calculation for equipment stat bonus
2015-07-18 16:00:04 -05:00
841923e054
Add level bonus calculation script
2015-07-18 16:00:03 -05:00
a9757c9dbb
Refactor member service; Remove logic in functions that were never used
2015-07-18 16:00:03 -05:00
4a54363966
fix(quests): Show info modal for Gold quests
2015-07-15 14:02:49 -05:00
435d33724b
Set test to listen on rootScope.openModal
2015-07-14 18:32:50 -05:00
08e9f4f769
fix(test): Quest buy typo
2015-07-14 17:42:15 -05:00
6cad2df6a3
test(quests): Add user.ops.buyQuest test
...
Also adds the Bailey announcement for the day and implements "locked" quest scrolls for the beginning quests in extant quest chains.
2015-07-14 17:34:01 -05:00
5e0d754553
fix(test): Inject Content
2015-07-14 14:55:13 -05:00
79b3597693
fix(tests): Buy specific quest keys
2015-07-14 14:27:25 -05:00
af5b7d4d24
fix(test): Partial tests fix
2015-07-14 14:24:11 -05:00
eb3a72995c
test(quests): Buy quest tests
2015-07-14 12:43:02 -05:00
0955d63998
test(quests): Fix tests
2015-07-14 11:46:13 -05:00
266b6b87e2
test(quests): Quests Service spec WIP
...
First test on new Quests Service. Also fix Armoire tests to account for new items.
2015-07-13 19:16:29 -05:00
316c3e9c2e
Sort out conflicts from develop
2015-07-12 13:51:42 -05:00
cdcc085530
Adjust test
2015-07-10 23:21:23 -05:00
acb82f99ce
Remove user's group msg notification when they are kicked from the group
2015-07-10 22:39:17 -05:00
c0d35dc472
WIP(quests): Quests page cont'd
...
Test fixes and addition of function for buying Quests with Gold
2015-07-08 17:43:08 -05:00
78d4989544
WIP(event): Summer Splash cont'd
...
Splits Quests out to a new page. Refactors inventory Jade files and controllers to more manageable structures.
2015-07-08 16:13:23 -05:00
4bcff71859
Adjust login modal
...
* Rename loginForm
* Use larger buttons for logging in or registering
* Use fully translated placeholder text
2015-07-02 07:58:11 -05:00
547523c8f7
Merge branch 'crookedneighbor-blade-refactor-clone-challenges' into release-june-30th-2015
2015-06-29 17:56:42 -05:00
bc837fd4db
Moved menu stuff to own controller
2015-06-29 12:39:05 -05:00
567ed1f28b
Correct seenMessage use in menu
...
Closes #5519
2015-06-29 08:58:51 -05:00
b72b14fe6c
Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync
2015-06-28 21:07:32 -05:00
bcf141840d
Merge branch 'TheHollidayInn-tasks-search-checklists' into develop
2015-06-27 22:23:08 -05:00
4abd7f85f8
Adjustments to PR#5494
...
* Update filter name to be more accurate
* Add additional tests
* Simplify checklist checking logic
* Prevent errors from multiple matches in checklist
2015-06-27 22:21:50 -05:00
d7a203ccc2
set all daily repeat code and tests to use true/false instead of 1/0 for consistency with DailySchema; comment-out unused default Daily repeat code
2015-06-27 20:06:04 +10:00
8ba621795a
Task filter now searches checklists
2015-06-25 22:33:08 -05:00
2d78f6c838
Remove only from karma test
2015-06-24 08:15:33 -05:00
8c343c1845
*ahem* You saw nothing.
2015-06-24 03:45:25 -04:00
c8b5480157
Repair tests to respect setTimeout
2015-06-24 03:41:49 -04:00
Blade Barringer