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
11368 commits 3 branches 0 tags 1.6 GiB
Commit graph

1573 commits

Author SHA1 Message Date
Sabe Jones
0a6d9fa23a WIP(pets): Frog quest 2015-10-19 23:12:24 -04:00
Blade Barringer
703caeadff Merge pull request #6038 from vIiRuS/patch-5 
store iOS tutorial steps
 2015-10-19 17:49:13 -05:00
Blade Barringer
a0753d31b2 Merge pull request #6046 from vIiRuS/newIAPs 
Handle new possible iOS in-app-purchases
 2015-10-19 17:49:01 -05:00
Matteo Pagliazzi
ad6be153f4 Revert "use lowercase only emails - register phase" 
This reverts commit 69fdff615a.
 2015-10-19 19:42:25 +02:00
Matteo Pagliazzi
7a2d2fd3dc Revert 215ca0371c 2015-10-19 19:42:13 +02:00
Blade Barringer
9ad1dbd8ce Adjust mystic hourglass string to take in interpolation 2015-10-19 08:10:37 -05:00
Blade Barringer
d9de32f2dc Add todo to investigate magic numbers 2015-10-19 08:04:47 -05:00
Blade Barringer
1a2510e4da Adjsut string to take in interpolation 2015-10-19 08:03:27 -05:00
Blade Barringer
931d688637 Use Content service 2015-10-19 08:03:14 -05:00
Blade Barringer
f03be07595 Add extra line breaks 2015-10-19 08:02:35 -05:00
Phillip Thelen
2fde3c771f remove empty line 2015-10-19 12:50:30 +02:00
Phillip Thelen
3a42711427 nicer style for default gem value 2015-10-19 12:48:50 +02:00
Phillip Thelen
7a7d038602 Split up tutorial parts 2015-10-18 17:29:06 +02:00
Sabe Jones
22ec450521 feat(modals): Won Challenge 
Draft of the modal that appears when a user wins a challenge. Needs better logic for when to display.
 2015-10-16 23:36:57 -04:00
ksami
65dc274e49 Make text in options/settings translatable 2015-10-16 20:48:12 +08:00
Sabe Jones
338aced208 feat(modals): Grew Mount 
A modal now appears when you raise a pet into a mount, which allows the user to immediately equip the new mount.
 2015-10-15 17:33:20 -04:00
Sabe Jones
c6dd2a0d10 feat(modals): Hatch Pet modal 
Complete except for the planned addition of a heart sprite over the pet.
 2015-10-15 16:34:53 -04:00
Matteo Pagliazzi
215ca0371c fix(signup): correct email checks 2015-10-15 19:52:21 +02:00
Matteo Pagliazzi
69fdff615a use lowercase only emails - register phase 2015-10-15 18:26:23 +02:00
Sabe Jones
380265731f feat(world-boss): Exhaust Ian's text 2015-10-14 21:02:59 -04:00
Phillip Thelen
4835de55a8 Adjust iap test 2015-10-15 00:09:24 +02:00
Phillip Thelen
319c294354 Fix global variable leak 2015-10-15 00:08:25 +02:00
Sabe Jones
e88030e15f Merge pull request #6039 from HabitRPG/sabrecat/halloween-mount 
Jack-O'-Lantern mounts
 2015-10-14 16:46:55 -05:00
Phillip Thelen
b0922f04b8 Handle new possible iOS in-app-purchases 2015-10-14 23:21:19 +02:00
Sabe Jones
59b2c1662e fix(news): Revised Bailey 2015-10-14 12:54:33 -04:00
Rory O’Kane
4a23f40415 Fix capitalization of “GitHub” on Contact Us page 
The live page is at https://habitica.com/static/contact.
 2015-10-14 03:55:46 -04:00
Sabe Jones
5bfea172ee fix(notifications): Don't double-modal 
Corrects behavior of the Notifications controller so that it skips showing the generic levelup modal if it's going to display the quest scroll version.
 2015-10-13 17:01:07 -04:00
Sabe Jones
6505824cb6 feat(modals): Levelup modal 
Introduces a new modal that displays whenever the user levels up.
 2015-10-13 16:32:07 -04:00
Sabe Jones
5eacba54b8 feat(modals): Slim scroll notif 
Establishes a new template for modal notifications, to be used across the app including a number of new notifications.
 2015-10-13 14:20:51 -04:00
Sabe Jones
dcf17b5505 feat(event): Jack-O'-Lantern mounts 2015-10-12 14:49:12 -04:00
Phillip Thelen
caa7d4a220 store iOS tutorial steps 2015-10-12 16:34:07 +02:00
Alys
ece3e0d0aa add FAQ item for World Bosses 2015-10-12 21:26:59 +10:00
Phillip Thelen
87012f6a7c Add iOS start app banner 2015-10-10 13:52:53 +02:00
Sabe Jones
f00bbd9652 feat(modals): Small style scroll award 2015-10-09 15:39:36 -04:00
Sabe Jones
b775b8f399 feat(modals): Simplified scroll drop 
Conflicts:
	website/views/shared/modals/quests.jade
 2015-10-09 14:07:54 -04:00
Alys
20415da586 Merge pull request #6018 from dcecile/develop 
Issue #2606 - Verify/fix indices during sortTask
 2015-10-09 21:30:14 +10:00
Blade Barringer
2cc4d65d78 Allow disabling logger in non-prod for testing 2015-10-08 22:42:09 -05:00
Sabe Jones
291a135fe1 Merge pull request #6023 from HabitRPG/sabrecat/world-boss 
Fall 2015 World Boss
 2015-10-08 11:15:00 -05:00
Blade Barringer
36d471ddff Correct module exports 2015-10-08 08:42:42 -05:00
Blade Barringer
5e10b8f4c9 Correct assinging of tavernQuest object when boss damage is calculated 2015-10-08 08:32:40 -05:00
Blade Barringer
9e88d17a78 Adjust tavern export to send over only quest object 2015-10-08 07:45:25 -05:00
Dan Cecile
22284bbc24 Issue #2606 - Verify/fix indices during sortTask 
Because the 'sortTask' operation uses a 'from' index and a 'to'
index as parameters, the server needs to check if these indices
are valid before performing the client's request. If the task ID
doesn't match the task at the 'from' index, then it's clear that
the client was looking at a preened list of todos (everything except
more-than-3-days-old-non-quest completed tasks). In that case, try
to recalculate the indices before continuing.
 2015-10-06 21:24:34 -04:00
Sabe Jones
51355f7eea fix(quest-eggs): Short-circuit canBuy 
Also corrects the FAQ link in the site footer to use the new static FAQ page instead of the wiki.
 2015-10-06 16:56:17 -04:00
Sabe Jones
d27fb9dba2 WIP(world-boss): Rage and rewards 
Also finishes out written story content.
 2015-10-06 15:59:16 -04:00
Sabe Jones
3ca836a81c fix(world-boss): Pass test 
Also uncomment the line used to hide display of the boss in the Tavern, because we won't be doing a dry run of that style this time around.
 2015-10-05 17:18:44 -04:00
Sabe Jones
f6abcc0ddf WIP(world-boss): Initial stats outlay 
Also quest reward sprites, groundwork for world damage, and partial content build.
 2015-10-05 16:59:19 -04:00
Sabe Jones
0d7a57d176 Merge branch 'develop' into sabrecat/world-boss 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
 2015-10-05 14:57:59 -04:00
Sabe Jones
dd53383ec6 Merge pull request #6002 from HabitRPG/sabrecat/backgrounds-201510 
October 2015 backgrounds
 2015-10-05 11:29:44 -05:00
Blade Barringer
2683b2b0a0 Use var to declare mongoose 2015-10-03 20:55:28 -05:00
Sabe Jones
56419aee25 feat(content): October 2015 backgrounds 2015-10-02 16:13:11 -04:00
Blade Barringer
be3decf859 Merge branch 'develop' into refactor-content 2015-10-01 21:20:04 -05:00
Sabe Jones
8e69681718 chore(news): Bailey 2015-10-01 2015-10-01 15:48:18 -04:00
Sabe Jones
233211adc9 Merge pull request #5962 from HabitRPG/sabrecat/magic-potions 
Magic Potions!
 2015-10-01 14:04:14 -05:00
Blade Barringer
0f8c3e03c2 Correct mount mixin 2015-10-01 13:25:00 -05:00
Blade Barringer
c8afac9580 Put magic pets on their own row 2015-10-01 13:21:15 -05:00
Blade Barringer
6c9fab254d Add coffeescript dependency back in 2015-09-30 22:49:19 -05:00
Blade Barringer
08e6759da2 Fix path to content 2015-09-30 22:38:23 -05:00
Blade Barringer
6ad7b6ba4c Correct content in analytics 2015-09-30 20:56:40 -05:00
Sabe Jones
3968acecb4 chore(news): Bailey 2015-09-30 2015-09-30 15:39:38 -04:00
Sabe Jones
9afaa92c2e feat(magic-potions): Clarify drop behavior 2015-09-30 15:31:09 -04:00
Sabe Jones
feff6fadfa feat(magic-potions): Final tweaks 2015-09-28 14:58:46 -04:00
Sabe Jones
8dcfe3078f fix(inventory): Missing pixel paws 2015-09-25 16:31:07 -04:00
Sabe Jones
38bdbf020b feat(content): Generalize canBuy 2015-09-25 15:01:08 -04:00
Blade Barringer
c21802e7e7 Merge branch 'develop' into refactor-content 2015-09-25 12:22:11 -05:00
Matteo Pagliazzi
a0f84bcf48 fix a few eslint rules 2015-09-25 15:58:39 +02:00
Sabe Jones
04416c4d73 feat(pets): Improve egg canBuy logic 2015-09-24 17:33:58 -04:00
Sabe Jones
6d6f0f597b feat(world-boss): Dry run 2015-09-24 15:39:16 -04:00
Sabe Jones
1aa5757847 fix(magic-potions): Hatching tweaks 
* Additional notes on popover noting magic potions can't be used on quest pet eggs
* Less techy error message when attempting to hatch quest pet egg with magic potion
* Don't highlight quest pet eggs as targets for magic hatching potion
 2015-09-23 16:40:45 -04:00
Sabe Jones
c953a25fe4 Merge branch 'develop' into sabrecat/magic-potions 2015-09-23 16:08:47 -04:00
Sabe Jones
35068481c4 chore(news): Fall plotline Bailey 2015-09-23 15:58:13 -04:00
Sabe Jones
009c92b532 feat(content): September sub items and customizations 2015-09-23 15:23:42 -04:00
Blade Barringer
955c163544 Merge branch 'develop' into refactor-content 2015-09-23 07:52:36 -05:00
Sabe Jones
6a6b67b9c1 Merge pull request #5909 from HabitRPG/sabrecat/social-buttons 
Front page Tweet button
 2015-09-22 17:38:47 -05:00
Sabe Jones
8c67d22a91 feat(pets): Full purchase behavior 2015-09-22 17:03:41 -04:00
Sabe Jones
e96410aa57 feat(pets): Spooky pets/mounts 2015-09-22 14:23:52 -04:00
Sabe Jones
389b5b370a feat(pets): Magic Hatching Potions WIP 2015-09-21 17:12:23 -04:00
Sabe Jones
b3297383d3 Merge pull request #5954 from HabitRPG/sabrecat/fall-2015 
Fall Festival 2015
 2015-09-21 12:06:40 -05:00
Blade Barringer
2a530a207d Rename translation key 2015-09-19 10:41:21 -05:00
LuneFox
ec336c4f88 added link to the newbies guild 2015-09-19 01:11:27 +03:00
Sabe Jones
aed39a206d fix(services): Remove accidental WIP inclusion 2015-09-18 15:24:56 -04:00
Sabe Jones
3e8a3ee5f4 feat(event): Fall Festival 2015 2015-09-18 15:19:59 -04:00
Kevin Gisi
4525ee5358 Revert "Revert "Removed user's party invites when last user leaves party"" 2015-09-17 23:27:21 -04:00
Kevin Gisi
c26cd1fe5b Revert "Removed user's party invites when last user leaves party" 2015-09-17 04:00:07 -04:00
Sabe Jones
347d028af7 fix(API): Fix inaccessible route 
Mystic Hourglass routes aren't yet used by live code.
 2015-09-17 01:57:28 -04:00
Blade Barringer
8881dbc034 Remove uneeded blank spaces 2015-09-16 20:01:42 -05:00
Sabe Jones
9be0990217 chore(news): Bailey 2015-09-16 2015-09-16 18:34:20 -04:00
Sabe Jones
eb0dd636c1 feat(hourglass): Confirm before buy 2015-09-16 17:40:25 -04:00
Sabe Jones
fb50f27fa7 fix(hourglass): Use method on $scope 2015-09-16 16:46:12 -04:00
Sabe Jones
98cd8364c6 feat(hourglass): Individual filter functions 2015-09-16 16:35:04 -04:00
Sabe Jones
c8cc01fc44 feat(hourglass): Buy pets/mounts 
Functionally complete as of this commit. Further commits will provide more polish and refactoring.
 2015-09-16 14:35:43 -04:00
Sabe Jones
25b133c562 Merge branch 'develop' into sabrecat/timetravel-stable 2015-09-16 12:48:12 -04:00
Blade Barringer
c9c169a0fb Merge pull request #5912 from TheHollidayInn/group-remove-party-invites-when-last-member-leaves 
Removed user's party invites when last user leaves party
 2015-09-16 07:59:32 -05:00
Blade Barringer
f71e3e20eb Merge pull request #5934 from HabitRPG/adjustments_to_group_front_end_only 
Adjustments to group quest behavior
 2015-09-15 18:57:32 -05:00
Blade Barringer
4c84728873 Removes quest from group if quest leader is booted 2015-09-15 18:10:31 -05:00
Blade Barringer
a655242c49 Correct test assertion 2015-09-15 17:38:22 -05:00
Blade Barringer
9abe67b0ad Prevent quest leaders from leaving party 
(cherry picked from commit dc43aa5902e89de4fa12f2747dd36c7906197a43)
 2015-09-15 16:41:50 -05:00
Blade Barringer
f8850755d0 Correct leave call to prevent leaving if quest is in progress 
(cherry picked from commit eddea562f42b1d58c97fae72863fd6f6e7dbee37)
 2015-09-15 16:41:25 -05:00
Blade Barringer
78fe1073d4 Add user sync to sendAction 2015-09-15 16:39:08 -05:00
Sabe Jones
6e4cc4b35b fix(API): Missing colons 2015-09-15 15:47:19 -04:00
Sabe Jones
ce764ca28e WIP(hourglass): Mystery sets API route 2015-09-15 15:41:57 -04:00