krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 15:17:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
10,150 Commits 64 Branches 1,225 Tags
fca6f91f1320e6e00324b3cdb3988a75d6b99f1d
Commit Graph

197 Commits

Author SHA1 Message Date
Blade Barringer
fca6f91f13 Merge branch 'develop' into analytics-service-server-side 2015-07-24 15:19:31 -05:00
Sabe Jones
d32d05e873 feat(mystery): July 2015 goodies 
Also makes the mystery box opening notification translatable and adds item graphics to it.
 2015-07-23 12:05:13 -05:00
Blade Barringer
bfd56b35e1 Revert armoire counting code back to old system 
@TODO: work out why it's hpapening and unpend test for new system
 2015-07-23 08:43:08 -05:00
Blade Barringer
c41271e558 Merge branch 'develop' into refactor_member_modal_and_stats_page 2015-07-22 17:39:39 -05:00
Blade Barringer
7b9102c88c Move gear counting to counting script 2015-07-22 17:37:35 -05:00
Blade Barringer
f40cfd2b66 Move all pet counting to shared count scripts 2015-07-22 17:32:12 -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
2695419182 Use better beastMaster / mountMaster counts 2015-07-19 21:51:30 -05:00
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
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
Sabe Jones
ffc441ab82 feat(quests): Improve drop notif 2015-07-16 16:22:49 -05:00
Alys
d8e7108098 moved twoHanded:true out of bracketed region in rancherLasso - it was causing "Error processing the string" 2015-07-15 14:56:57 +10: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
Blade Barringer
cb992e1083 Added category to whale quest 2015-07-12 21:16:49 -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
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
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
6cc0a08dc2 feat(event): Derby Day pet quest 2015-07-09 12:57:43 -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
46543f9072 feat(event): Derby Day mount 2015-07-08 16:07:37 -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
Sabe Jones
25dd82ffa0 feat(event): Summer Splash cont'd 
Summer backgrounds, the Seafoam transformation item, and announcements for same.
 2015-07-01 13:11:53 -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
sablecliff
c8dd666939 Implemented changes as suggested by @crookedneighbour 
Should be passing all tests now.
 2015-06-29 18:11:12 +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
eceae75631 Merge pull request #5482 from Alys/startDate-fix-2015-06-25 
Refactor api.shouldDo and fix https://github.com/HabitRPG/habitrpg/issues/5395
 2015-06-28 07:31:04 +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