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

6254 commits

This branch
This branch
All branches
Author SHA1 Message Date
negue
3e41b62bc9 Include mixins.jade also in layout.jade 2015-01-30 17:47:55 +01:00
Matteo Pagliazzi
ea3d72836f add image for new email 2015-01-30 17:14:34 +01:00
negue
e6a5feeeb6 Merge pull request #4590 from negue/fixAchievementsOnMobile 
aLink mixin to handle mobile links
 2015-01-30 00:17:10 +01:00
Negue
e165f5dac4 move aLink to mixins.jade 2015-01-29 20:40:06 +01:00
Blade Barringer
6b25797154 Added reminder about swearing to the tavern chat box 2015-01-29 12:22:26 -06:00
Negue
4a16deb50d aLink mixin to handle mobile links 2015-01-29 18:16:33 +01:00
Matteo Pagliazzi
01d695cae5 fix(grunt): allow caching of spritesheets, fix #4542 2015-01-29 17:59:30 +01:00
Blade Barringer
154b8a00e5 Merge pull request #4585 from crookedneighbor/quest-scroll-popover-and-modal-changes 
Quest scroll popover and modal changes
 2015-01-28 15:39:32 -06:00
Blade Barringer
5f1d138241 Added comment about questPopover function 2015-01-28 15:38:41 -06:00
Blade Barringer
275f55cbfe Removed extra space 2015-01-28 15:36:13 -06:00
Blade Barringer
c328d0fd3c Removed hp from popover function 2015-01-28 15:11:32 -06:00
Blade Barringer
043baf4961 Removed hp from modals 2015-01-28 15:10:21 -06:00
Blade Barringer
e6e1ea086e Fixed alignment of notes on tasks 2015-01-28 14:51:51 -06:00
Blade Barringer
d3d12bc638 Added popover-append-to-body to inventory popovers 2015-01-28 14:23:38 -06:00
Blade Barringer
84552597d6 Adjusted hrs for popovers 2015-01-28 14:00:06 -06:00
Blade Barringer
4c6bf8f543 Added append to body to quest scroll popovers 2015-01-28 13:37:34 -06:00
Matteo Pagliazzi
50bc48f325 fix(share): addthis in static pages 2015-01-28 20:32:35 +01:00
Blade Barringer
ca897d7cf3 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-01-28 10:56:57 -06:00
Blade Barringer
23c31083ef Fixed triad count to actually check and make sure count is 90 2015-01-28 10:56:16 -06:00
benmanley
dc5f980083 fix(tasks): improve habit icon alignment 
See #4539

Align habit buttons using a different CSS technique to prevent plus
icon from being cropped on Chrome for Windows.
 2015-01-28 13:25:24 +00:00
Blade Barringer
d8e09884a0 Added quest image and info to quest invitation modal 2015-01-27 20:37:09 -06:00
Blade Barringer
a77a46c543 Added one time bindings to quest modals 2015-01-27 20:27:14 -06:00
Blade Barringer
eaaa09c75a Added quest details to buy quest and show quest modals 2015-01-27 20:16:11 -06:00
Blade Barringer
4e1716a8db Added hp to quest popover 2015-01-27 20:15:28 -06:00
Blade Barringer
b56c5af978 Changed popover text for quest scrolls. Closes #4575 2015-01-27 19:32:06 -06:00
Blade Barringer
0096873cf5 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-01-27 09:47:03 -06:00
Blade Barringer
58650baba3 Merge branch 'issue#4556' of https://github.com/matttelliott/habitrpg into border 2015-01-27 09:10:46 -06:00
Matteo Pagliazzi
42c0b443d7 fix(i18n): language selection working on static pages 2015-01-27 15:48:57 +01:00
Matt T Elliott
2c40097403 move from left div to right 2015-01-26 23:14:19 -08:00
Matt T Elliott
3a38bb849b add .border-left 2015-01-26 23:08:15 -08:00
Blade Barringer
b9784fa4aa Added notice for rebirth in seasonal shop 2015-01-26 22:15:24 -06:00
Blade Barringer
7eae5db256 Added comment describing the silly conditional for transparency in the 
seasonal shop
 2015-01-26 19:25:53 -06:00
Blade Barringer
3b1743dee8 Corrected ng-class condition to show transparent class 
on seasonal shop items after rebirth
 2015-01-26 18:55:10 -06:00
Blade Barringer
eceaaef954 Merge pull request #4567 from crookedneighbor/add-audio-watts 
Added Watts' Theme to Audio Choices
 2015-01-26 11:27:27 -06:00
Sabe Jones
65af7f362e Merge branch 'scrolls' into develop 
Conflicts:
	views/shared/new-stuff.jade
 2015-01-26 11:18:48 -06:00
Sabe Jones
ad08f1be9a fix(news): Errant parenthesis 2015-01-26 11:11:04 -06:00
Sabe Jones
524761f1cf feat(mystery): January subscriber set 2015-01-26 11:00:02 -06:00
Blade Barringer
9b5b83871f Refined triad Bingo calculation 2015-01-25 21:00:34 -06:00
Blade Barringer
d9ecd41c1e Fixed mountCount calculation 2015-01-25 20:26:51 -06:00
Alice Harris
9ab86b536f adjusted comments 2015-01-24 16:46:18 +10:00
Alice Harris
a95522e165 create script to convert false to null in items.mounts for https://github.com/HabitRPG/habitrpg/pull/4374#issuecomment-71038795 2015-01-24 16:16:05 +10:00
Blade Barringer
9f38ac86f7 Replaced blank death sound with actual sound files instead of blank 
files
 2015-01-23 15:27:57 -06:00
Blade Barringer
93c39e81bd Added death sound. Put blank versions in daniel theme 2015-01-23 14:59:18 -06:00
Blade Barringer
de59c76609 Added watts themes to audio choices 2015-01-23 14:53:30 -06:00
Sabe Jones
412417505f feat(quests): Differentiated scrolls 
Implements logic to show specific scroll images per quest, falling back to the present scroll image if none is present. Also implements a "locked scroll" picture for unavailable quests in addition to the current background dimming.
 2015-01-23 10:40:32 -06:00
Sabe Jones
ec114d6a3e chore(news): Victory Bailey 
Also includes a fix to disallow party quest bosses from using Rage healing to exceed initial Health.
 2015-01-23 10:20:50 -06:00
Blade Barringer
042f2fbceb Merge pull request #4498 from crookedneighbor/see-mp 
See mp on stats page
 2015-01-22 11:57:15 -06:00
Sabe Jones
9d7fc1efbb chore(news): Stress Strike 3 Bailey 2015-01-21 10:17:19 -06:00
Blade Barringer
5c8450ba1a Corrected triad bingo achievement for users that already had it 2015-01-20 19:26:29 -06:00
Blade Barringer
5246257f62 Merge pull request #4550 from HabitRPG/bailey-20150120 
Bailey 20150120 & Mount Master
 2015-01-20 17:06:14 -06:00