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

6237 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Blade Barringer
c73fb9eb31 Added in missing p tag 2015-01-20 16:44:49 -06:00
Blade Barringer
d4ab70b174 Removed errant comma 2015-01-20 16:41:36 -06:00
Blade Barringer
e95b238041 Gave credit to badge creators 2015-01-20 16:33:18 -06:00
Blade Barringer
cc65ea1346 Lemoness removed from items she didn't work on 2015-01-20 16:32:30 -06:00
Blade Barringer
de1c0240f6 Restored changelog 2015-01-20 16:22:29 -06:00
Blade Barringer
b0bb3adf53 removed quest line text 2015-01-20 16:09:43 -06:00
Blade Barringer
7842bbe22e Added stressbeast strike news 2015-01-20 15:58:00 -06:00
Blade Barringer
ebd5bbd19b Added new info to Bailey announcement 2015-01-20 14:37:17 -06:00
Matteo Pagliazzi
925bfe8af4 fix(emails): parse json 2015-01-20 20:59:43 +01:00
Matteo Pagliazzi
9d22e65e19 fix(flags-emails): allow arrays in FLAG_REPORT_EMAIL 2015-01-20 18:33:49 +01:00
Matteo Pagliazzi
065227fa8c fix(flags-emails): allow arrays in tnxEmails 2015-01-20 18:29:46 +01:00
Blade Barringer
07fec4a205 Merge branch 'mountmaster' into bailey-20150120 2015-01-20 10:30:40 -06:00
Sabe Jones
f0d4135d54 Merge pull request #4546 from SabreCat/stressbeast 
World boss desperation move
 2015-01-19 23:17:32 -06:00
Sabe Jones
da2d59734c fix(world-boss): simplify desperation stats 2015-01-19 23:00:00 -06:00
Sabe Jones
0137dd7209 fix(world-boss): Need markModified 2015-01-19 22:36:10 -06:00
Sabe Jones
0a0a3f78cf fix(world-boss): Desperation logic 2015-01-19 22:14:09 -06:00
Blade Barringer
3189ab92af Wrote error message for when trying to send gems to self from balance 2015-01-19 22:13:21 -06:00