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

353 Commits

Author SHA1 Message Date
Blade Barringer e72543641c Puts keys of the kennel modal on the inventory ctrl so pet counting variables can be accesssed 
Closes #5668
 2015-07-25 23:22:35 -05:00
Blade Barringer f31d1b4b1b Merge branch 'develop' into TheHollidayInn-tasks-select-with-keys-fix 2015-07-24 22:16:57 -05:00
Sabe Jones d022a0eb67 Merge branch 'develop' into sabrecat/death-modal 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith0.png
	common/dist/sprites/spritesmith2.png
	common/dist/sprites/spritesmith3.css
	common/dist/sprites/spritesmith3.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png
 2015-07-24 16:11:51 -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 c41271e558 Merge branch 'develop' into refactor_member_modal_and_stats_page 2015-07-22 17:39:39 -05:00
Sabe Jones 0f1c92184c chore(news): iOS update Bailey 2015-07-22 15:42:35 -05:00
Sabe Jones 7d622792a8 Merge pull request #5635 from HabitRPG/sabrecat/quests-page 
Improve quest drop notification
 2015-07-22 10:28:16 -07:00
Sabe Jones 0313170921 feat(quests): Invite party button 2015-07-21 15:25:34 -05:00
Sabe Jones 5789f22320 WIP(death): Draft with decal 2015-07-21 14:39:08 -05:00
Sabe Jones 0039a17366 WIP(death): More display tweaks 2015-07-21 13:57:13 -05:00
Sabe Jones c286d08bc8 WIP(death): New death modal 2015-07-20 16:24:05 -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 11f56d491c Remove close button from menu 
Closes #3820
 2015-07-19 19:08:48 -05:00
Blade Barringer a139ca8ba5 Merge branch 'develop' into refactor_member_modal_and_stats_page 2015-07-18 17:10:04 -05:00
Blade Barringer dc2fab14d0 Merge branch 'GitHubSphinx-Sphinx-i18n-db1' into develop 2015-07-18 17:06:26 -05:00
Blade Barringer 4cff85784d Move stats to separate partials 2015-07-18 16:00:09 -05:00
Blade Barringer b716d882b6 Began refactor of stats page 2015-07-18 16:00:08 -05:00
hairlessbear 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
hairlessbear d8f74e5d9f First shot at modifying stats.jade attribute table to use ng-repeat 2015-07-18 16:00:03 -05:00
Matteo Pagliazzi 86eaff7cb0 fix(i18n): string for amazon payments 2015-07-17 15:28:55 +02:00
Sabe Jones 3f8a4a0957 fix(quests): Remove controller instantiation 2015-07-16 16:35:21 -05:00
Sabe Jones ffc441ab82 feat(quests): Improve drop notif 2015-07-16 16:22:49 -05:00
Sabe Jones 73a1c7c596 fix(style): Remove extra class 2015-07-16 11:29:04 -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
GihHubSphinx e48703602a Make colon is stats hideable 2015-07-16 12:00:56 +05:00
GihHubSphinx aa0aec8d4b Revert "New string in stats if gear has no benefits (take 2)" 
This reverts commit fdbd18a8ed.
 2015-07-16 10:54:17 +05:00
Sabe Jones c15f2b1f80 Merge branch 'sabrecat/quests-page' into develop 2015-07-15 14:12:05 -05:00
Sabe Jones 4a54363966 fix(quests): Show info modal for Gold quests 2015-07-15 14:02:49 -05:00
Matteo Pagliazzi e0bfd60eb1 amazon payments: switch to green button 2015-07-15 20:07:17 +02:00
Matteo Pagliazzi ecc98411c7 refactor amazon payments and add one time purchases once again 2015-07-15 20:07:17 +02:00
Matteo Pagliazzi de32461787 feat(amazon-payments): WIP add donations 2015-07-15 20:07:17 +02:00
Sabe Jones 32a74471db Merge branch 'sabrecat/quests-page' into develop 2015-07-14 18:56:32 -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
Blade Barringer 60e92805dd Remove unneeded comment 2015-07-13 08:36:01 -05:00
Blade Barringer 316c3e9c2e Sort out conflicts from develop 2015-07-12 13:51:42 -05:00
TheHollidayInn fe6a42b2b7 Escaped second parameter in sparameter in score function 2015-07-11 21:25:00 -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
Blade Barringer c941511d11 Merge branch 'barbourkd-develop' into develop 2015-07-11 00:11:23 -05:00
Blade Barringer 50a924e470 Add space 2015-07-11 00:11:02 -05:00
Blade Barringer 09d85f39fc Merge pull request #5586 from GitHubSphinx/Sphinx-entry2 
Introducing a class for buttons allowing wrapping
 2015-07-11 00:07:26 -05:00
Blade Barringer ddf2489664 Merge pull request #5581 from barbourkd/bugfix/5552 
Show Extra Notes icon regardless of task ownership.
 2015-07-11 00:05:04 -05:00
GihHubSphinx 00f7af7807 Introducing a class for buttons allowing wrapping 
New .btn-wrap class for buttons with long text allowing wrapping
 2015-07-10 02:33:09 +05:00
Sabe Jones d5f97b2781 chore(news): Derby Day Bailey 2015-07-09 14:24:22 -05:00
Kevin Barbour 5a57895077 Show Extra Notes icon regardless of task ownership. 
fixes #5552
 2015-07-08 20:48:42 -04:00
Kevin Barbour d6aef8ee24 Prevent "Resting in the Inn" message when viewing challenges. 
fixes #5559
 2015-07-08 20:22:23 -04: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