 Blade Barringer
|
8a363efc43
|
Merge branch 'develop' into TheHollidayInn-pet-actions-esc-to-cancel
|
2015-07-22 17:59:50 -05:00 |
|
|
Blade Barringer
|
7b9102c88c
|
Move gear counting to counting script
|
2015-07-22 17:37:35 -05:00 |
|
|
TheHollidayInn
|
c61eccaaba
|
Removed if statements and fixed style issues
|
2015-07-22 15:38:17 -05: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 |
|
|
Blade Barringer
|
73e1764413
|
Move beast/mount master counts to separate file
|
2015-07-21 08:13:50 -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
|
1fb068d06d
|
Update test for new quest name
|
2015-07-19 10:17:03 -05:00 |
|
|
Blade Barringer
|
054d884154
|
Merge branch 'develop' into analytics-service-server-side
|
2015-07-19 10:13:34 -05:00 |
|
|
Blade Barringer
|
0ce1183652
|
Automatically sends item name when item is purchased
|
2015-07-19 10:06:50 -05:00 |
|
|
Blade Barringer
|
b49995c676
|
Allow optional value to be passed in
|
2015-07-19 08:33:44 -05:00 |
|
|
Blade Barringer
|
deac9619bc
|
Refactor to use object method of sending google data
|
2015-07-19 08:27:16 -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
|
163b0545e8
|
Adjustments for error handling
|
2015-07-18 16:00:04 -05:00 |
|
|
Blade Barringer
|
6d5b57d139
|
Add class bonus calc function
|
2015-07-18 16:00:04 -05:00 |
|
|
Blade Barringer
|
e5428f29c1
|
Add calculation for equipment stat bonus
|
2015-07-18 16:00:04 -05:00 |
|
|
Blade Barringer
|
841923e054
|
Add level bonus calculation script
|
2015-07-18 16:00:03 -05:00 |
|
|
Blade Barringer
|
a9757c9dbb
|
Refactor member service; Remove logic in functions that were never used
|
2015-07-18 16:00:03 -05:00 |
|
|
Sabe Jones
|
4a54363966
|
fix(quests): Show info modal for Gold quests
|
2015-07-15 14:02:49 -05:00 |
|
|
Blade Barringer
|
435d33724b
|
Set test to listen on rootScope.openModal
|
2015-07-14 18:32:50 -05:00 |
|
|
Sabe Jones
|
08e9f4f769
|
fix(test): Quest buy typo
|
2015-07-14 17:42:15 -05:00 |
|
|
Sabe Jones
|
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 |
|
|
Sabe Jones
|
5e0d754553
|
fix(test): Inject Content
|
2015-07-14 14:55:13 -05:00 |
|
|
Sabe Jones
|
79b3597693
|
fix(tests): Buy specific quest keys
|
2015-07-14 14:27:25 -05:00 |
|
|
Sabe Jones
|
af5b7d4d24
|
fix(test): Partial tests fix
|
2015-07-14 14:24:11 -05:00 |
|
|
Sabe Jones
|
eb3a72995c
|
test(quests): Buy quest tests
|
2015-07-14 12:43:02 -05:00 |
|
|
Sabe Jones
|
0955d63998
|
test(quests): Fix tests
|
2015-07-14 11:46:13 -05:00 |
|
|
Sabe Jones
|
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 |
|
|
Blade Barringer
|
316c3e9c2e
|
Sort out conflicts from develop
|
2015-07-12 13:51:42 -05:00 |
|
|
Blade Barringer
|
284fa03223
|
Add platform, change itemName to itemKey
|
2015-07-12 10:03:41 -05:00 |
|
|
Blade Barringer
|
cdcc085530
|
Adjust test
|
2015-07-10 23:21:23 -05:00 |
|
|
TheHollidayInn
|
acb82f99ce
|
Remove user's group msg notification when they are kicked from the group
|
2015-07-10 22:39:17 -05:00 |
|
|
Blade Barringer
|
a6d162bfc0
|
Update how info is sent to google
|
2015-07-09 22:17:27 -05:00 |
|
|
Blade Barringer
|
7bc74f2c11
|
Track unsubscription
|
2015-07-08 21:47:57 -05:00 |
|
|
Sabe Jones
|
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 |
|
|
Sabe Jones
|
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 |
|
|
Blade Barringer
|
1c2ec66c93
|
Add format user data function to analytics server
|
2015-07-08 08:09:43 -05:00 |
|
|
Blade Barringer
|
d2b74f11dd
|
Create analytics.track
|
2015-07-07 18:00:41 -05:00 |
|
|
Blade Barringer
|
e6ee4d303c
|
Set up purchase tracking
|
2015-07-06 08:11:31 -05:00 |
|
|
Blade Barringer
|
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 |
|