Blade Barringer
f40cfd2b66
Move all pet counting to shared count scripts
2015-07-22 17:32:12 -05:00
TheHollidayInn
c61eccaaba
Removed if statements and fixed style issues
2015-07-22 15:38:17 -05:00
Sabe Jones
6d52f842ff
fix(quest): Move party jump to cb
2015-07-22 11:52:15 -05:00
TheHollidayInn
107e27a2c6
Deselect food, egg, and potion when hitting the escape key
2015-07-21 21:52:29 -05:00
Sabe Jones
0313170921
feat(quests): Invite party button
2015-07-21 15:25:34 -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
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
054d884154
Merge branch 'develop' into analytics-service-server-side
2015-07-19 10:13:34 -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
94d476f837
Correct method name
2015-07-18 16:00:06 -05:00
Blade Barringer
a9757c9dbb
Refactor member service; Remove logic in functions that were never used
2015-07-18 16:00:03 -05:00
hairlessbear
dbf406c921
Fixes #5623 and fixes #5135 (correctly displays equipment stats in member modals)
2015-07-18 16:00:02 -05:00
Sabe Jones
ffc441ab82
feat(quests): Improve drop notif
2015-07-16 16:22:49 -05:00
Sabe Jones
2407c9eeb8
feat(quests): Improve buy confirm dialog
2015-07-16 12:56:26 -05:00
Sabe Jones
e25819f6de
feat(party): Conclude invite experiment
2015-07-16 11:22:19 -05:00
Matteo Pagliazzi
695c793f6e
Merge pull request #5632 from HabitRPG/paglias/amazon-payments
...
Amazon Payments: implement one time purchases
2015-07-16 13:24:42 +02:00
Sabe Jones
4a54363966
fix(quests): Show info modal for Gold quests
2015-07-15 14:02:49 -05:00
Matteo Pagliazzi
ecc98411c7
refactor amazon payments and add one time purchases once again
2015-07-15 20:07:17 +02:00
Matteo Pagliazzi
bade139b4b
wip amazon payments donation
2015-07-15 20:07:17 +02:00
Blade Barringer
316c3e9c2e
Sort out conflicts from develop
2015-07-12 13:51:42 -05:00
Blade Barringer
6ac049cc71
Allow animal ears to be added to costume or equipped gear
2015-07-12 09:23:03 -05:00
Alys
92bfc66c67
fix a bug where if you had "Use Costume" ticked, any Battle Gear or Costume choice would be added to your costume, never to Battle Gear
2015-07-12 18:18:31 +10:00
Blade Barringer
b71f68ef32
Merge branch 'develop' into equipment-refactor-merge-into-develop
2015-07-11 15:55:53 -05:00
Blade Barringer
dccc10aa4d
Refactor
2015-07-11 15:05:58 -05:00
Blade Barringer
c33a22ceb3
Put locale key creation into private function
2015-07-11 12:07:20 -05:00
Blade Barringer
94cd0bb852
Use user variable
2015-07-11 11:18:19 -05:00
Blade Barringer
d2e61bf5ef
Change string to str
2015-07-11 11:15:04 -05:00
Blade Barringer
cb4b2e43bf
Change variable name to itemList
2015-07-11 11:14:50 -05:00
Sabe Jones
5e89ae200d
feat(analytics): Server tweaks
...
Remove duplicate browser-side tracking for new user registration. Move quest tracking to server side and expand to include all quest accept/reject actions.
2015-07-10 13:47:03 -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
Sabe Jones
fb81c79b78
feat(analytics): Invite Friends experiment
...
Disables the prior landing page Google Experiment and begins a new one involving the placement and captioning of the button for inviting friends to the user's party.
2015-07-02 16:13:22 -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
Matteo Pagliazzi
ca36c5c632
Merge pull request #5531 from HabitRPG/paglias/amazon-payments
...
Amazon Payments Subscriptions
2015-07-01 01:40:27 +02:00
Sabe Jones
71d8fd2f0c
fix(analytics): Handle missing user object
2015-06-30 17:13:56 -05:00
Sabe Jones
3d15da61ec
fix(analytics): Correct user ID handling
2015-06-30 16:52:18 -05:00
Matteo Pagliazzi
65f4aac23c
feat(amazon-payments): working subscriptions, put donations and gifts on hold
2015-06-30 17:59:30 +02:00