Blade Barringer
054d884154
Merge branch 'develop' into analytics-service-server-side
2015-07-19 10:13:34 -05:00
Blade Barringer
a950339f01
Clarify cron
2015-07-19 08:41:45 -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
2b4e48fbe6
Add stat calc to common
2015-07-18 16:00:05 -05:00
Sabe Jones
ffc441ab82
feat(quests): Improve drop notif
2015-07-16 16:22:49 -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
Sabe Jones
b9f795529b
feat(quests): Dilatory Distress
...
Implements the "Dilatory Distress" quest chain, purchasable for Gold. Also adds four new items to the Enchanted Armoire.
2015-07-13 18:21:32 -05:00
Blade Barringer
87f5449267
Merge branch 'develop' into quests-fix-merge-coflicts
2015-07-13 08:20:52 -05:00
Matteo Pagliazzi
4b170cd4dc
chore(i18n): update locales
2015-07-12 23:45:26 +02:00
Blade Barringer
316c3e9c2e
Sort out conflicts from develop
2015-07-12 13:51:42 -05:00
Blade Barringer
74de248109
Adjust how quest drops are sent
2015-07-12 10:05:00 -05:00
Blade Barringer
284fa03223
Add platform, change itemName to itemKey
2015-07-12 10:03:41 -05:00
Alys
18db504d2a
allow Trivial priority (difficulty) to cause a tiny amount of damage from a boss
2015-07-12 11:05:01 +10:00
Blade Barringer
305414e152
Merge pull request #5553 from Lokeh/Lokeh/maxHealth
...
maxHealth refactor
2015-07-11 00:18:15 -05:00
Blade Barringer
2f1d3400bc
Added additional analytics info
2015-07-10 07:47:52 -05:00
Blade Barringer
52620bb69d
Impliment analytics in user actions; remove mixpanel
2015-07-09 22:18:37 -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
Blade Barringer
73b2d816d1
Track cron with analytics service
2015-07-08 08:08:45 -05:00
Alys
d7084ce0c8
remove unnecessary default for dailyTask.startDate (website/src/models/task.js gives default); give user's timezone to their task startDate values (possible solution for https://github.com/HabitRPG/habitrpg/issues/5395 https://github.com/HabitRPG/habitrpg/issues/5510 https://github.com/HabitRPG/habitrpg/issues/5549 )
2015-07-05 19:22:10 +10:00
Will
4027c99959
maxHealth added to shared scripts
2015-07-03 22:22:28 -07:00
Blade Barringer
e924157fdf
Merge pull request #5508 from Alys/trivial-difficulty
...
add Trivial difficulty/priority setting to task Advanced Options
2015-07-03 10:08:46 -05:00
Alys
2cd34b0f6e
make api.shouldDo use the day being checked as the default date instead of today - fixes https://github.com/HabitRPG/habitrpg/issues/5521
2015-06-30 14:28:00 +10:00
Alys
122920975d
add Trivial difficulty/priority setting to task Advanced Options (also remove whitespace at ends of lines)
2015-06-28 14:41:02 +10:00
Alys
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
Alys
51fb278438
stop changing the task's actual Start Date, move related task Start Date code tothe same place, adjust comments
2015-06-25 12:19:27 +10:00
Alys
9b8b7af7d5
replace api.numDaysApart (not used elsewhere and new to the EveryXDays code) with moment#diff
2015-06-25 12:19:26 +10:00
Alys
e7e82a2aed
keep startDate as a moment(), fix check for Start Date in future (ignore time, don't do incorrect CDS conversion), add comments
2015-06-25 12:19:26 +10:00
Alys
266055c0d4
rename 'day' variable to 'startOfDayWithCDSTime' (more verbose, sorry, but clearer)
2015-06-25 12:19:26 +10:00
Alys
99bc09fb25
move dayOfWeekNum to correct scope and improve comment
2015-06-25 12:19:26 +10:00
Alys
f6cdc57228
move dailyTask.repeat error handling to correct location; add dailyTask.everyX error handling (might not be needed)
2015-06-25 12:19:26 +10:00
Alys
bacd35b895
refactor shouldDo check for Daily's startDate being in the future
2015-06-25 12:19:26 +10:00
Blade Barringer
96162b37bd
Merge pull request #5433 from gisikw/ultimate-gear-fix
...
Ultimate gear fix
2015-06-20 17:34:47 -05:00
Alys
6eac1174a2
sort eligibleEquipment before choosing random item from Enchaned Armoire - possible partial fix for https://github.com/HabitRPG/habitrpg/issues/5376#issuecomment-111799217
2015-06-20 20:22:27 +10:00
Kevin Gisi
f32305458a
Fix armoire edge case
2015-06-20 01:58:54 -04:00
Blade Barringer
ecb2544cdc
Merge pull request #5396 from hairlessbear/remove_freeRebirth
...
Removed 'freeRebirth' from user model and everywhere else in codebase
2015-06-15 08:00:18 -05:00
Phillip Thelen
e4a10d70ee
Add human readable text to response
2015-06-15 12:57:08 +02:00
Phillip Thelen
4aa9e81d8a
Add data about armoire content to buy response
2015-06-14 18:08:58 +02:00
hairlessbear
4bf1b94c1d
Removed 'freeRebirth' from user model and all uses in codebase
2015-06-13 14:18:03 -04:00
hairlessbear
2504b06026
Removed user.achievements.ultimateGear checks from orb of rebirth logic ( fixes #5352 )
2015-06-12 17:17:50 -04:00
Blade Barringer
1d18f53a67
Merge branch 'develop' into blade-Finish_weeklies_pr
...
Added Sabe's novalidate change to adding a new task
2015-06-10 07:53:37 -05:00
Blade Barringer
ca72b9a9e1
Merge branch 'chimericdream-issues/4838' into develop
2015-06-09 12:45:22 -05:00
Sabe Jones
fe9666d5ee
fix(achievements): Never strip Ultimate Gear
...
Fixes #5369 .
2015-06-09 10:47:59 -05:00
Bill Parrott
05286d1e8f
use correct http status code
2015-06-09 08:55:06 -05:00
Bill Parrott
9cbc21d798
check for duplicate task ID when adding a new task
2015-06-09 08:55:06 -05:00
Alys
e5b8c5c4e0
use a different random seed for starting Armoire randomness than for sub-choices within it to prevent bug that gives only some foods
2015-06-08 21:15:51 +10:00
Blade Barringer
164a26616e
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-05 17:35:16 -05:00
Sabe Jones
804cced3ff
chore(various): News and sprites
...
Also tweaks the drop probability of equipment from 70% to 60%.
2015-06-05 10:22:22 -05:00
Sabe Jones
20859b83ef
feat(Armoire): Improved counter
...
The popover counter of remaining Equipment in the Armoire now counts down immediately instead of requiring a browser refresh. A modal announces when the last item has been found. Also includes several fixes to the Ultimate Gear migration.
2015-06-04 15:45:55 -05:00
Blade Barringer
705e0dce71
Calculate days since task start with start of day
2015-06-04 08:25:06 -05:00