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

1817 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Blade Barringer
e7cb3f58e9 Merge branch 'issue4468' of https://github.com/scribblypanda/habitrpg-shared into scribblypanda-issue4468 2015-01-18 15:24:48 -06:00
Blade Barringer
6c9c2a5ec1 Merge pull request #445 from j-wilkins/patch-1 
fix typo in README.md
 2015-01-18 12:00:15 -06:00
Jake Wilkins
d6a7fa0d2c s/migraring/migrating 2015-01-18 10:35:03 -07:00
Tyler Renelle
436e8b5622 Merge pull request #444 from HabitRPG/lefnire/one-module 
Move to a single "habitrpg" module for services / directives / filters
 2015-01-17 19:08:21 -07:00
Tyler Renelle
81bdb2481c refactor(services): move to a single "habitrpg" module for services / 
directives / filters
 2015-01-17 18:42:01 -07:00
Blade Barringer
2efadf7381 Removed white space on t-rex iamges closes #4531 2015-01-16 22:33:06 -06:00
Tyler Renelle
465bfe4df9 Merge pull request #443 from HabitRPG/lefnire/httpinterceptor 
move httpInterceptor from app.js to habitrpg-shared/config.js
 2015-01-16 18:32:52 -07:00
Tyler Renelle
dbeb6f8c1e refactor(config): add mobile 2015-01-16 18:31:37 -07:00
Tyler Renelle
6b6802a27a refactor(config): move httpInterceptor from website/app.js to 
habitrpg-shared/config.js. Will merge in mobile soon
 2015-01-16 16:48:35 -07:00
Blade Barringer
75971b0f40 Added triad bingo check to releaseBoth function 2015-01-16 17:01:01 -06:00
Blade Barringer
8b1ba48bfe Merge branch 'mountmaster' into triad-bingo 2015-01-16 16:53:35 -06:00
Blade Barringer
d9fed69147 Corrected releasBoth function to reset current pet and deduct the 
correct amount of gems
 2015-01-16 16:52:59 -06:00
Blade Barringer
5b2c4d5a09 Compiled css 2015-01-16 12:23:25 -06:00
Blade Barringer
1460e5762e Added sprite 2015-01-16 12:15:22 -06:00
Blade Barringer
d4d18dcee5 Added triad bingo achievement 2015-01-16 12:14:51 -06:00
Blade Barringer
3625cf514e Added triad bingo achievement test 2015-01-16 11:49:00 -06:00
Blade Barringer
e565bf7896 Added initial strings for triad bingo 2015-01-16 11:25:49 -06:00
Blade Barringer
e8b6779be6 Merge branch 'mountmaster' of github.com:HabitRPG/habitrpg-shared into mountmaster 2015-01-16 10:47:50 -06:00
Blade Barringer
75cf2a4788 Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into mountmaster 
Conflicts:
	dist/habitrpg-shared.css
	dist/habitrpg-shared.js
	dist/spritesmith0.css
	dist/spritesmith0.png
 2015-01-16 10:46:59 -06:00
Matteo Pagliazzi
c301bd3e89 fix(console): remove console.log 2015-01-16 17:46:47 +01:00