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

412 commits

Author SHA1 Message Date
Sabe Jones
502e7f0af2 Merge branch 'develop' into sabrecat/more-modals 2015-11-03 14:29:23 -05:00
Sabe Jones
2cb4e80019 chore(event): End Fall Festival 2015-11-02 12:55:48 -05:00
Blade Barringer
add761e58e Remove extraneous div 2015-10-30 23:05:19 -05:00
Blade Barringer
92271c2049 Clean up view for market. 2015-10-30 22:49:13 -05:00
Thrashmandicoot
1051ff0006 Fix inline-styling to be class styling 2015-10-30 20:01:22 -07:00
Sabe Jones
5d3f41637f Merge branch 'develop' into sabrecat/more-modals 2015-10-30 16:33:17 -04:00
Thrashmandicoot
64ea4e42e7 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into merchant-button-fix 2015-10-30 03:43:35 -07:00
Thrashmandicoot
0e52a62ad2 dynamic images for merchant, finishes refactor 2015-10-30 03:43:13 -07:00
Thrashmandicoot
e1b26a884c Add display for selling items, needs right img 2015-10-30 02:27:36 -07:00
Blade Barringer
dd09633d31 Merge branch 'locks-auto-equip' into develop 2015-10-29 12:25:18 -05:00
Sabe Jones
f4ea6c1d5d feat(sharing): Opt Out WIP 
First draft of support for opting out of future modal display on specific events, and adds the second barebones target page for sharing.
 2015-10-28 16:36:47 -04:00
Blade Barringer
cdc58c78fd Merge branch 'nicolevonvon-develop' into develop 2015-10-27 20:19:09 -05:00
Blade Barringer
c812c0ae90 Add popover to no owner label 2015-10-27 20:18:39 -05:00
nicolevonvon
47ec2e1f93 Challenges now display'no owner' if original owner deletes account 2015-10-27 22:15:19 +02:00
Blade Barringer
c04b27ffd5 Simplify community guidelines string 2015-10-26 18:08:45 -05:00
ksami
f2c856f6e6 Make link translatable in options/inventory/time-travelers 2015-10-23 23:40:11 +08:00
ksami
b3cc58886c Make strings translatable in options/social/chat-box 2015-10-23 23:20:59 +08:00
Sabe Jones
d0a34fc0ad feat(quests): 2015-10 Pet 
Also adds Exhaust Strike-specific text to the remaining affected NPCs.
 2015-10-20 12:32:45 -04:00
Blade Barringer
9ad1dbd8ce Adjust mystic hourglass string to take in interpolation 2015-10-19 08:10:37 -05:00
Blade Barringer
1a2510e4da Adjsut string to take in interpolation 2015-10-19 08:03:27 -05:00
Ricardo Mendes
73924df241 Adds auto-equip UI to equipment view 2015-10-19 05:20:11 +00:00
ksami
65dc274e49 Make text in options/settings translatable 2015-10-16 20:48:12 +08:00
Sabe Jones
380265731f feat(world-boss): Exhaust Ian's text 2015-10-14 21:02:59 -04:00
Thrashmandicoot
40ea62344b Add bold to item output when selling item 2015-10-07 20:11:07 -07:00
Thrashmandicoot
7c16197ec9 Refactor market to display eggs properly, wip 2015-10-07 19:19:56 -07:00
Thrashmandicoot
dadf1d5b0b Add divider between sell button and text for market 2015-10-07 11:52:47 -07: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
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
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
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
009c92b532 feat(content): September sub items and customizations 2015-09-23 15:23:42 -04: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
3e8a3ee5f4 feat(event): Fall Festival 2015 2015-09-18 15:19:59 -04:00
Sabe Jones
eb0dd636c1 feat(hourglass): Confirm before buy 2015-09-16 17:40:25 -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