sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-03 08:21:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
10233 commits 3 branches 0 tags 1.6 GiB
Commit graph

656 commits

Author SHA1 Message Date
Sabe Jones
b4e3efeab7 fix(news): Break before list 
For readability
 2015-07-29 14:17:32 -05:00
Sabe Jones
bbbae27631 chore(naming-day): Bailey and sprites 2015-07-29 14:12:04 -05:00
Sabe Jones
39a17d933d fix(achievements): Day copypasta 2015-07-28 16:26:46 -05:00
Sabe Jones
ceb9cf7817 WIP(event): Habitica Day 2015-07-28 16:20:08 -05:00
Sabe Jones
8492541636 fix(visuals): Armoire and Seasonal Shop 
Cleans up the Enchanted Armoire sprite and fixes bad alignment of Gem prices on the Seasonal Shop page.
 2015-07-28 13:35:17 -05:00
Sabe Jones
5d5f1d2b1b chore(legal): Update revision date 2015-07-27 16:58:16 -05:00
Sabe Jones
4f36ecb8d1 fix(legal): TOS and privacy tweaks 
Also updates the front page daily users brag to account for the 25% growth since the introduction of the joinOthers string.
 2015-07-27 15:26:31 -05:00
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
Blade Barringer
6aae668b8c Rework gem adjustment so it actually makes sense 2015-07-24 17:30:47 -05:00
Blade Barringer
a89b612bbe Impliment challenge controller changes in view 2015-07-24 17:30:42 -05:00
TheHollidayInn
fce622ddc7 Added hide and error message when a user tries to create a challenge for HabitRPG group and they have no gems 2015-07-24 17:30:36 -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
8a363efc43 Merge branch 'develop' into TheHollidayInn-pet-actions-esc-to-cancel 2015-07-22 17:59:50 -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
TheHollidayInn
107e27a2c6 Deselect food, egg, and potion when hitting the escape key 2015-07-21 21:52:29 -05: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
65c14b1e3f Refactor inventory ctrl variables 2015-07-20 12:51:10 -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
4f5626b73b Merge branch 'hairlessbear-fix-ian-popover' into develop 2015-07-18 17:00:32 -05:00
Blade Barringer
4e6c2e7335 Add missing classes 2015-07-18 16:59:54 -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 0d6bc403d069036d998f43c6f7b9173be8f13157.
 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
hairlessbear
c61c572887 '.row.col-md-12' changed to '.row: .col-md-12' 2015-07-16 21:10:48 -04:00
hairlessbear
eae7f79363 Fixed time traveler items repositioning strangely on window resize 2015-07-16 20:37:14 -04:00
hairlessbear
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
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