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

1697 commits

This branch
This branch
All branches
Author SHA1 Message Date
scribblypanda
d9cb197d95 added new translatable string emailChange 2015-01-11 03:31:32 -05:00
scribblypanda
9aca62a53d added new translatable string emailChange 2015-01-11 03:21:53 -05:00
scribblypanda
2718fd39e3 off-hand to shield-hand in gear.json and questsContent.json 2015-01-05 23:27:04 -05:00
Sabe Jones
61b827183b fix(grunt): Push CSS 2015-01-05 17:15:05 -06:00
Sabe Jones
97a48eb66e chore(grunt): grunt full 2015-01-05 17:00:17 -06:00
Sabe Jones
285ff6228c fix(backgrounds): Frigid, not Snowy, Peak 2015-01-05 16:41:23 -06:00
Sabe Jones
0bfc5b37c0 feat(backgrounds): January backgrounds 2015-01-05 16:36:11 -06:00
negue
1bdacffe96 Merge pull request #428 from negue/markdownDirective 
add remove-watch and use-timeout attribute to the markdown directive
 2015-01-05 22:11:38 +01:00
Matteo Pagliazzi
a65c675243 chore(i18n): add hungarian and update locales 2015-01-05 17:31:26 +01:00
Blade Barringer
a54e1cd448 Compiled version of adjustment to spells 2015-01-04 16:15:36 -06:00
Blade Barringer
5d6da27a70 Merge branch 'issue4454habitrpg' of https://github.com/melissamcewen/habitrpg-shared into melissamcewen-issue4454habitrpg 2015-01-04 16:10:30 -06:00
Tyler Renelle
8b4c6c450b Revert "revert last commit" 
This reverts commit 0cc87d4ea0.
 2015-01-03 13:59:13 -07:00
Matteo Pagliazzi
0cc87d4ea0 revert last commit 2015-01-02 19:07:31 +01:00
Matteo Pagliazzi
d362003cdf fix json 2015-01-02 18:52:14 +01:00
Matteo Pagliazzi
1f258e601c move spritesmith and phantomjs to dev dependencies 2015-01-02 18:50:39 +01:00
Matteo Pagliazzi
edbfc24b08 fix(i18n): remove duplicate strings cc @negue 2015-01-02 12:45:40 +01:00
Sabe Jones
83559c5d98 chore(January): Jan updates 
Reverts New Year's NPCs to normal winter garb and updates the Mystery Item package to its January scheme.
 2015-01-01 23:18:18 -06:00
Blade Barringer
38a5dca58e Merge branch 'yearUpdate' of https://github.com/thehindenburg/habitrpg-shared into thehindenburg-yearUpdate 2015-01-01 15:37:55 -06:00
Sabe Jones
cf10ecb30e Merge pull request #424 from crookedneighbor/upgrade-spritesmith 
Updated spritesmith
 2015-01-01 15:36:11 -06:00
Melissa Mcewen
aa6abeecaa Salt spell doesn't check to see if you have enough Gold #4454 adding immediate use varibles to other spells 2015-01-01 14:47:04 -06:00
Melissa Mcewen
a40d820d56 Salt spell doesn't check to see if you have enough Gold #4454 adding immediate use varible to spell 2015-01-01 14:34:15 -06:00
Melissa Mcewen
4a30363bc7 Salt spell doesn't check to see if you have enough Gold #4454 adding immediate use varible to spell 2015-01-01 14:30:30 -06:00
Negue
571cc9ed1d change ngModel to text 2015-01-01 20:31:21 +01:00
Negue
f900e6451c add remove-watch and use-timeout attribute to the markdown directive 2015-01-01 18:20:33 +01:00
thehindenburg
74a871a8d2 add two years to winter gear 2014-12-31 17:46:06 -08:00
Blade Barringer
439f72cb91 Separated out the check for nyeRecieved and pushing to the array 2014-12-31 18:35:59 -06:00
Blade Barringer
0b57d42e2a Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into develop 2014-12-31 09:32:29 -06:00
Blade Barringer
611e350b63 Compiled changes to spookdust and snowball in task view 2014-12-31 09:31:09 -06:00
Blade Barringer
f2bf3efc5c Adjusted position of ghost and snowball 2014-12-31 09:14:29 -06:00
Blade Barringer
008f79ad84 Resized shop versions of snowball and spookdust to match gold coins 2014-12-31 09:08:58 -06:00
Blade Barringer
8fb22c5301 Merge pull request #422 from crookedneighbor/resize-special-items 
Resize special items
 2014-12-31 08:49:49 -06:00
Blade Barringer
92ad91d545 Reverted gruntfile back 2014-12-31 08:41:11 -06:00
Blade Barringer
015ab34a4f Compiled images with cards 2014-12-31 08:40:50 -06:00
Blade Barringer
7cd9674d97 Resized cards 2014-12-31 08:39:35 -06:00
Blade Barringer
63a96db650 Merge branch 'develop' into resize-special-items 
Conflicts:
	dist/habitrpg-shared.css
	dist/spritesmith3.css
	dist/spritesmith3.png
 2014-12-31 08:37:17 -06:00
Matteo Pagliazzi
c3283483e3 chore(i18n): update locales 2014-12-31 13:35:49 +01:00
Alice Harris
a7dd2dbd74 add canOwn code to nye2014 hat 2014-12-31 16:25:12 +10:00
Sabe Jones
fba6472b7e chore(grunt): grunt full 2014-12-30 22:21:16 -06:00
Sabe Jones
8fabcc4ffd Merge pull request #425 from SabreCat/nye 
New Year's event features
 2014-12-30 22:17:23 -06:00
Sabe Jones
dd3ec20e5e feat(NYE): Silly Party Hat 2014-12-30 21:20:07 -06:00
Tyler Renelle
5fc001e4f6 feat(google-discount): add google discount 2014-12-30 20:05:51 -07:00
Sabe Jones
7a16c644c3 fix(NYE): I18N for random text 2014-12-30 20:51:40 -06:00
Sabe Jones
11beb14e14 fix(NYE): t undefined 2014-12-30 20:42:32 -06:00
Sabe Jones
e7388822f1 fix(NYE): Card to self exploit 2014-12-30 20:33:45 -06:00
Sabe Jones
5623fb0078 fix(NYE): I18N shop text 2014-12-30 20:14:56 -06:00
Sabe Jones
dd13727765 feat(NYE): New Year's cards 2014-12-30 19:58:40 -06:00
Blade Barringer
a6560d1651 Compiled fortify potion into spritesheet 2014-12-30 19:06:40 -06:00
Blade Barringer
a0eb6f2229 Removed larger border from side of fortify potion 2014-12-30 19:04:25 -06:00
Blade Barringer
6b88ad6f2a Merge branch 'resize-pet-dragon-hydra' of https://github.com/bcseda/habitrpg-shared into bcseda-resize-pet-dragon-hydra 
Conflicts:
	img/sprites/spritesmith/stable/pets/Pet-Dragon-Hydra.png
 2014-12-30 15:01:52 -06:00
Blade Barringer
3a0dd0417a Compiled panda skull image to spritesheet 2014-12-30 14:49:56 -06:00