Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,047 Commits 64 Branches 1,256 Tags
163b0545e8f514667d9c2fffe896f527f2b24efb
Commit Graph

590 Commits

Author SHA1 Message Date
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
Matteo Pagliazzi 3fa8ab80b5 chore(i18n): update locales 2015-07-17 15:31:12 +02:00
Matteo Pagliazzi 86eaff7cb0 fix(i18n): string for amazon payments 2015-07-17 15:28:55 +02:00
Sabe Jones 2407c9eeb8 feat(quests): Improve buy confirm dialog 2015-07-16 12:56:26 -05:00
Blade Barringer 668a8bb6f6 chore(i18n): update locales 2015-07-16 12:04:10 -05:00
Alys 239f7c9c95 change message on Armoire when it is empty to say that new gear arrives in the first week of the month 2015-07-16 12:56:28 +10:00
Blade Barringer 8a97b597f5 Resize sea foam image 
Fixes #5609
 2015-07-15 07:53:12 -05:00
Matteo Pagliazzi 38ac664284 chore(i18n): update locales 2015-07-15 13:17:57 +02: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
Alys 9ccab259b0 add message to Inventory/Market (drops) page to explain where quests have gone 2015-07-15 13:29:03 +10:00
Sabe Jones 32a74471db Merge branch 'sabrecat/quests-page' into develop 2015-07-14 18:56:32 -05:00
Blade Barringer 1adb3c479b Merge branch 'blurbs' into develop 2015-07-14 18:21:37 -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
Matteo Pagliazzi 8f9fa7942a fix(settings): use correct value for inactivity emails 2015-07-15 00:13:17 +02:00
unknown a25296a855 adding more links to heroes blurb and links not included in json 2015-07-14 07:44:51 -05:00
unknown 65b7465081 adding blurbs to pages 2015-07-14 07:44:51 -05:00
Matteo Pagliazzi 6cf0840c71 chore(i18n): update locales 2015-07-14 13:55:03 +02: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 b01e4489ef Compile sprites 2015-07-12 22:30:46 -05:00
Blade Barringer 6f4b76edc5 Rename rancher armor to rancher robes 2015-07-12 22:25:05 -05:00
Blade Barringer dad6a9527b Added shop versions of armoire stuff 2015-07-12 22:21:39 -05:00
Blade Barringer 9ebf5dee2c Renamed crown sprite 2015-07-12 22:18:08 -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 add35bc17c Correct names of sprites 2015-07-12 12:21:12 -05:00
Blade Barringer d09b24e1a5 Add sprites to website 2015-07-12 08:24:03 -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 ba13f2d9aa Add locale strings 2015-07-11 15:05:32 -05:00
Alys ef496525a1 change white "Report" button to red "Report Violation" button in chat message flag modal 2015-07-11 21:23:39 +10:00
Blade Barringer 305414e152 Merge pull request #5553 from Lokeh/Lokeh/maxHealth 
maxHealth refactor
 2015-07-11 00:18:15 -05:00
Arbixal 48b520509c fixes https://github.com/HabitRPG/habitrpg/issues/5555 2015-07-11 00:15:55 -05:00
Matteo Pagliazzi 5e8baf6c92 chore(i18n): update locales 2015-07-10 15:45:58 +02:00
Sabe Jones d5f97b2781 chore(news): Derby Day Bailey 2015-07-09 14:24:22 -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
Sabe Jones 3dd2493fed chore(news): iOS release Bailey 2015-07-07 13:27:19 -05:00
Matteo Pagliazzi fa8e2785bd chore(i18n): update locales 2015-07-06 22:11:26 +02:00
Matteo Pagliazzi 1618534785 chore(i18n): update locales 2015-07-05 20:51:08 +02: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