c286d08bc8
WIP(death): New death modal
2015-07-20 16:24:05 -05:00
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
65c14b1e3f
Refactor inventory ctrl variables
2015-07-20 12:51:10 -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
11f56d491c
Remove close button from menu
...
Closes #3820
2015-07-19 19:08:48 -05:00
1fb068d06d
Update test for new quest name
2015-07-19 10:17:03 -05:00
054d884154
Merge branch 'develop' into analytics-service-server-side
2015-07-19 10:13:34 -05:00
16c6647b34
Bump version number to resolve error message
2015-07-19 10:09:00 -05:00
0ce1183652
Automatically sends item name when item is purchased
2015-07-19 10:06:50 -05:00
a950339f01
Clarify cron
2015-07-19 08:41:45 -05:00
b49995c676
Allow optional value to be passed in
2015-07-19 08:33:44 -05:00
deac9619bc
Refactor to use object method of sending google data
2015-07-19 08:27:16 -05:00
a139ca8ba5
Merge branch 'develop' into refactor_member_modal_and_stats_page
2015-07-18 17:10:04 -05:00
dc2fab14d0
Merge branch 'GitHubSphinx-Sphinx-i18n-db1' into develop
2015-07-18 17:06:26 -05:00
4f5626b73b
Merge branch 'hairlessbear-fix-ian-popover' into develop
2015-07-18 17:00:32 -05:00
4e6c2e7335
Add missing classes
2015-07-18 16:59:54 -05:00
4cff85784d
Move stats to separate partials
2015-07-18 16:00:09 -05:00
9994b27f1e
Fix member modal on static/front
2015-07-18 16:00:09 -05:00
d44dbef859
Move member modal controller to own file
2015-07-18 16:00:08 -05:00
b716d882b6
Began refactor of stats page
2015-07-18 16:00:08 -05:00
c784b97586
Create private method for how stats should be displayed
2015-07-18 16:00:08 -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
3926a6e95a
Remove unnecssary semicolons
2015-07-18 16:00:06 -05:00
94d476f837
Correct method name
2015-07-18 16:00:06 -05:00
ff42505d1b
Add string
2015-07-18 16:00:05 -05:00
2b4e48fbe6
Add stat calc to common
2015-07-18 16:00:05 -05:00
20148be288
Watch js files in common folder
2015-07-18 16:00:05 -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
6525cd6f8c
Revert "First shot at modifying stats.jade attribute table to use ng-repeat"
...
This reverts commit 0d6bc403d0
2015-07-18 16:00:03 -05:00
d8f74e5d9f
First shot at modifying stats.jade attribute table to use ng-repeat
2015-07-18 16:00:03 -05:00
dbf406c921
Fixes #5623 and fixes #5135 (correctly displays equipment stats in member modals)
2015-07-18 16:00:02 -05:00
3fa3b491dc
Modified common/script/index.coffee to display dayStart, but send back a
...
variable of dayStart for processing, instead of having the object directly
updated at the time of edit.
Modified website/views/options/settings.jade to allow a timestamp to be
cast to an iso timestamp because lastCron is saved as an iso timestamp,
and as a straight moment()-based timestamp in order to compare timestamps.
Modified website/public/js/controllers/settingsCtrl.js to do the
following:
Accept the new proposed dayStart
Calculate the timestamp of the old dayStart and the new dayStart
These two steps were necessary because dayStart is an integer between
and including 0 and 23. I tested and confirmed the current production
dayStart does not allow 24 to be entered but does allow 0. I was
careful to NOT change how that worked.
Cast the old dayStart, the new dayStart and lastCron to the moment()
version of time so they could be compared.
Cast the new dayStart to the iso timestamp for storage in lastCron
The important change is the following:
if oldDayStart < lastCron AND lastCron < newDayStart then lastCron
should be set to newDayStart. I modified this to include if oldDayStart
= lastCron, although I think that's pretty unlikely to be possible.
When I tested this, my lastCron was a mere 17 seconds after my
oldDayStart, so it seemed to me that the equal case should be included
with the less than case.
2015-07-17 21:17:07 -04:00
3fa8ab80b5
chore(i18n): update locales
2015-07-17 15:31:12 +02:00
86eaff7cb0
fix(i18n): string for amazon payments
2015-07-17 15:28:55 +02:00
c61c572887
'.row.col-md-12' changed to '.row: .col-md-12'
2015-07-16 21:10:48 -04:00
eae7f79363
Fixed time traveler items repositioning strangely on window resize
2015-07-16 20:37:14 -04:00
e2073f75b8
Refactored inventory file NPCs to use Bootstrap v3 grid and CSS instead of tables
2015-07-16 20:19:32 -04:00
Sabe Jones