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

10016 commits

This branch
This branch
All branches
Author SHA1 Message Date
Blade Barringer
e5a740a74f Adjust spacing 2015-07-14 19:32:45 -05:00
Sabe Jones
32a74471db Merge branch 'sabrecat/quests-page' into develop 2015-07-14 18:56:32 -05:00
Blade Barringer
435d33724b Set test to listen on rootScope.openModal 2015-07-14 18:32:50 -05:00
Blade Barringer
1adb3c479b Merge branch 'blurbs' into develop 2015-07-14 18:21:37 -05:00
Sabe Jones
08e9f4f769 fix(test): Quest buy typo 2015-07-14 17:42:15 -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
Sabe Jones
5e0d754553 fix(test): Inject Content 2015-07-14 14:55:13 -05:00
Sabe Jones
79b3597693 fix(tests): Buy specific quest keys 2015-07-14 14:27:25 -05:00
Sabe Jones
af5b7d4d24 fix(test): Partial tests fix 2015-07-14 14:24:11 -05:00
Sabe Jones
eb3a72995c test(quests): Buy quest tests 2015-07-14 12:43:02 -05:00
Sabe Jones
0955d63998 test(quests): Fix tests 2015-07-14 11:46:13 -05:00
Blade Barringer
7ad2839f05 Adjust look of page blurbs 2015-07-14 08:18:02 -05:00
Blade Barringer
cdc54038ba Remove bad file encoding 2015-07-14 07:56:53 -05:00
unknown
7e60864d41 Fixing color on blurbs 2015-07-14 07:46:57 -05:00
unknown
1789bf3c6a Making suggests changes to issue 5513 2015-07-14 07:44:51 -05: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
Blade Barringer
a01b2756f2 Merge pull request #5605 from hairlessbear/join-party-quest-invite-fix 
Invite a new party member to a quest if the quest is still in the invitation stage (fixes #5598)
 2015-07-13 22:37:46 -05: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
Alys
cb9f5bcff3 Merge pull request #5523 from hairlessbear/update_isOnQuest_logic 
Removed user.party.quest.key checks from isOnQuest and added check for user ID in quest members
 2015-07-14 08:11:35 +10:00
Sabe Jones
209989d7aa Merge pull request #5601 from crookedneighbor/quests-fix-merge-coflicts 
fix merge conflicts for quests refactor
 2015-07-13 12:18:27 -07:00
hairlessbear
7223eeb681 Invites a new party member to a quest if the quest is still in the invitation stage (fixes #5598) 2015-07-13 13:01:35 -04:00
Blade Barringer
60e92805dd Remove unneeded comment 2015-07-13 08:36:01 -05:00
Blade Barringer
87f5449267 Merge branch 'develop' into quests-fix-merge-coflicts 2015-07-13 08:20:52 -05:00
Blade Barringer
148e418c8a Change file names to use hyphen syntax 2015-07-13 08:19:15 -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
fefc8ee732 Merge pull request #5600 from gisikw/remove-apdex-check 
Remove apdex check from middleware until NR is back
 2015-07-12 23:50:35 +02:00
Matteo Pagliazzi
4b170cd4dc chore(i18n): update locales 2015-07-12 23:45:26 +02:00
Blade Barringer
fe5bbfadde Remove credit 2015-07-12 14:35:08 -05:00
Blade Barringer
4e9c252367 Removed extraneous jade file 2015-07-12 14:27:53 -05:00
Blade Barringer
0b53da0798 Double-check seasonal shop jades 2015-07-12 14:24:18 -05:00
Blade Barringer
316c3e9c2e Sort out conflicts from develop 2015-07-12 13:51:42 -05:00
Kevin Gisi
c82e5a885d Put memory check back in 2015-07-12 13:51:22 -04:00
Kevin Gisi
be420a67a0 Remove apdex check from middleware until NR is back 2015-07-12 13:39:16 -04:00
Blade Barringer
add35bc17c Correct names of sprites 2015-07-12 12:21:12 -05:00
Blade Barringer
6ac049cc71 Allow animal ears to be added to costume or equipped gear 2015-07-12 09:23:03 -05:00
Blade Barringer
d09b24e1a5 Add sprites to website 2015-07-12 08:24:03 -05:00
Alys
92bfc66c67 fix a bug where if you had "Use Costume" ticked, any Battle Gear or Costume choice would be added to your costume, never to Battle Gear 2015-07-12 18:18:31 +10: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
87dddb178f Merge branch 'duckspeaker-issue-5570-hall-of-heroes-table-resize' into develop 2015-07-11 16:53:09 -05:00
Blade Barringer
18ebbdac67 Remove extra class 2015-07-11 16:52:55 -05:00
Blade Barringer
c9ac32231d Remove inventory again 2015-07-11 16:37:26 -05:00
Blade Barringer
4a9ea83d6b Added whale quest back in, refactor 2015-07-11 16:35:16 -05:00