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

1837 commits

This branch
This branch
All branches
Author SHA1 Message Date
Blade Barringer
c9294897f7 Merge pull request #456 from Sporax/develop 
Changed capitalization of 'dailies', 'daily', and 'habit(s)'
 2015-01-29 10:06:55 -06:00
Saagar Saini
c69e3195df updated capitalization of habit(s), daily, dailies 2015-01-29 16:47:39 +05:30
Blade Barringer
6acec132b0 Recompiled shared 2015-01-28 13:53:19 -06:00
Blade Barringer
6def48e77e Merge pull request #455 from crookedneighbor/new-tasks-for-onboarding 
New tasks for onboarding
 2015-01-28 13:52:12 -06:00
Blade Barringer
75eb6304eb Renamed variable name 2015-01-28 13:51:03 -06:00
Blade Barringer
520df87362 fixed default todo note 2015-01-28 13:50:11 -06:00
Blade Barringer
21be3e8957 Adjusted default tasks per lemoness 2015-01-28 13:43:15 -06:00
Matteo Pagliazzi
dca6880d13 chore(i18n): update locales 2015-01-28 17:30:54 +01:00
Saagar Saini
cd19ef9607 changed capitalization of 'dailies', 'daily', and 'habit(s)' 2015-01-28 20:08:09 +05:30
Blade Barringer
7ef0c70b8b Added placeholder blank notes 2015-01-27 21:52:54 -06:00
Blade Barringer
b890326545 Added new tasks for onboarding per lemoness 2015-01-27 21:50:41 -06:00
Blade Barringer
e19cf6b37f Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into develop 2015-01-27 20:46:18 -06:00
Blade Barringer
70d3901000 New strings for quest modal 2015-01-27 20:46:01 -06:00
Matteo Pagliazzi
5ba1e96b3c chore(i18n): update locales 2015-01-27 20:36:03 +01:00
Sabe Jones
6a1e9e616d chore(grunt): grunt sprite 2015-01-27 12:01:12 -06:00
Sabe Jones
b8d9f047b1 fix(sprites): Rooster recolors 
Fixes https://github.com/HabitRPG/habitrpg/issues/4576.
 2015-01-27 11:54:16 -06:00
Alice Harris
68573b1f31 Merge pull request #453 from Sporax/develop 
changed description for A stern talking-to from - habit to negative Habit - fixes https://github.com/HabitRPG/habitrpg/issues/4570
 2015-01-27 19:05:48 +10:00
Blade Barringer
0c40b43013 Added rebirth notice for seasonal shop 2015-01-26 22:15:05 -06:00
Saagar Saini
c83a91886d Update questsContent.json 2015-01-27 03:34:15 +05:30
Saagar Saini
b469419c70 changed description for A stern talking-to from - habit to negative Habit 2015-01-27 03:03:43 +05:30
Sabe Jones
9389899ed2 chore(grunt): grunt full 2015-01-26 11:23:40 -06:00
Sabe Jones
e70fce24f5 Merge pull request #451 from SabreCat/scrolls 
Differentiated quest scrolls and January 2015 subscriber item
 2015-01-26 11:20:29 -06:00
Sabe Jones
e2f47651a4 feat(mystery): January subscriber set 2015-01-26 10:59:29 -06:00
Sabe Jones
009255bdb5 fix(sprite): Improved Nameless Helm 
Fixes https://github.com/HabitRPG/habitrpg/issues/4568.
 2015-01-24 10:57:24 -06:00
Blade Barringer
72bc1cf40c Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into develop 2015-01-23 15:29:36 -06:00
Blade Barringer
318dd506af Added watts theme string 2015-01-23 15:29:00 -06:00
Matteo Pagliazzi
e8f6091764 chore(i118n): update locales 2015-01-23 21:01:24 +01:00
Sabe Jones
2ca6636c94 feat(quests): Differentiated scrolls 
Adds pixel art for individual quests so they can be differentiated in the Market.
 2015-01-23 10:27:13 -06:00
Blade Barringer
32ed4dace7 Fixed triad bingo achievement not being awarded to people who already 
had it
 2015-01-20 19:24:46 -06:00
Blade Barringer
76373ed816 Merge pull request #447 from HabitRPG/bailey-20150120 
Bailey 20150120 & Mount Master
 2015-01-20 17:06:02 -06:00
negue
cb566a9679 Merge pull request #441 from negue/markdown 
markdown timeoutTime attribute
 2015-01-20 17:57:23 +01:00
Blade Barringer
cc6cb3785e Merge branch 'mountmaster' into bailey-20150120 
Conflicts:
	dist/habitrpg-shared.css
	dist/spritesmith0.css
	dist/spritesmith0.png
	dist/spritesmith1.css
	dist/spritesmith1.png
	dist/spritesmith2.css
	dist/spritesmith2.png
	dist/spritesmith3.css
	dist/spritesmith3.png
	dist/spritesmith4.css
	dist/spritesmith4.png
 2015-01-20 10:39:45 -06:00
Sabe Jones
6a6a4e5924 Merge pull request #446 from SabreCat/stressbeast 
World boss desperation move
 2015-01-19 23:17:26 -06:00
Sabe Jones
7925935ff5 feat(world-boss): Desperation move 2015-01-19 21:47:27 -06:00
Blade Barringer
42e1020c60 Added back in showCompleted=false to display tags 2015-01-19 18:50:54 -06:00
Tyler Renelle
899de5fc25 grunt 2015-01-19 16:14:21 -07:00
Alice Harris
64cd6eac25 Merge pull request #350 from Alys/todos-dated-tab-2014-11-01 
create a "Dated" To-Dos tab
 2015-01-19 18:16:17 +10:00
Alice Harris
da1a11b62d Merge remote-tracking branch 'upstream/develop' into todos-dated-tab-2014-11-01 2015-01-19 17:53:48 +10:00
Blade Barringer
62d7505233 Merge pull request #423 from crookedneighbor/vIiRuS-groupSorting 
Additional options for group sorting in header
 2015-01-18 23:08:34 -06:00
Blade Barringer
6a7d84b842 Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into develop 2015-01-18 21:24:28 -06:00
Blade Barringer
8b864e114b Compiled spritesheets 2015-01-18 21:11:49 -06:00
Blade Barringer
86c7203170 Added rock mounts 2015-01-18 21:11:41 -06:00
Blade Barringer
511b4a1b0b Added pet rocks 2015-01-18 20:34:12 -06:00
Alice Harris
9b9b70b7d4 change "level" to "tier"; remove incorrect number of gems 2015-01-19 11:24:42 +10:00
Blade Barringer
e22269fd61 Merge pull request #442 from HabitRPG/triad-bingo 
Triad bingo
 2015-01-18 19:12:18 -06:00
Blade Barringer
69c9c12969 Updated keys to kennel info for triad bingo 2015-01-18 19:10:50 -06:00
Blade Barringer
418f54a32d Added rock pet egg 2015-01-18 18:38:56 -06:00
Blade Barringer
0bb9aa9f56 Added rock quest boss 2015-01-18 18:30:54 -06:00
Blade Barringer
3bed7d8153 Added january mystery items 2015-01-18 18:25:25 -06:00
Blade Barringer
c13f6b15a1 Added feb background images 2015-01-18 18:12:45 -06:00