krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 07:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,560 Commits 64 Branches 1,226 Tags
d5148a7bf01f196d77c83a028190b277b51aaf47
Commit Graph

168 Commits

Author SHA1 Message Date
Blade Barringer
d02c3d321e refactor: Remove compiled spritesheet from source control 2016-01-14 18:03:14 -06:00
Sabe Jones
14a6d0dabf feat(quests): January 2016 pet 2016-01-13 17:15:02 -05:00
Matteo Pagliazzi
f83b271b30 rever new history preening 2016-01-13 11:07:52 +01:00
Blade Barringer
502ba27b47 chore(sprites): Compile sprites 2016-01-09 23:32:17 -06:00
Matteo Pagliazzi
be0fe3eb4f Merge pull request #6479 from HabitRPG/new-history-preening 
New history preening
 2016-01-09 20:12:33 +01:00
Sabe Jones
1b7f17cbd2 chore(news): Bailey 2016-01-08 2016-01-08 16:28:49 -05:00
Matteo Pagliazzi
fdd5ab724a begin implementing new preenUserHistory method: port current code to es6 and setup tests 2016-01-07 18:44:25 +01:00
Sabe Jones
adfa248dd0 feat(content): backgrounds and Armoire 2016-01 2016-01-06 15:11:20 -05:00
Sabe Jones
6c3e8e2081 feat(event): more NYE 2015-12-30 16:58:57 -05:00
Sabe Jones
054e3cb361 feat(event): New Year's Eve 2015 2015-12-29 14:55:05 -05:00
Blade Barringer
5127068ca7 chore: Compile css 2015-12-26 19:02:28 -06:00
darkmeep
1c261056fe clear local storage page added 
changed submit bug to clear browser data

feat(views): Style clear local storage button
 2015-12-26 19:00:42 -06:00
Sabe Jones
7d0efdeeda chore(news): Android announcement 
Also adds a higher-quality version of the Winter Town background.
 2015-12-23 14:43:16 -05:00
Sabe Jones
468198b9e2 feat(mystery): subscriber items 2015-12 
Also enables the Snowball in the Seasonal Shop.
 2015-12-22 16:16:30 -05:00
Sabe Jones
c259c5c819 fix(event): sprite and string tweaks 2015-12-18 17:58:46 -05:00
Sabe Jones
493ae6f26a feat(event): Winter Wonderland complete 2015-12-18 15:48:14 -05:00
Sabe Jones
6ed9133f70 WIP(event): Winter Wonderland 2015-16 partial 2015-12-15 17:15:02 -05:00
Sabe Jones
fe1de12494 feat(pets): December quest 2015-12-14 16:28:39 -05:00
Blade Barringer
81067efd19 Merge branch 'joyclark-new_mount_heads' into develop 2015-12-12 17:16:36 -06:00
Blade Barringer
ee87d1b4b7 chore(sprites): Compile 2015-12-12 17:12:53 -06:00
Alys
5d6c4d4dcd add Android app with Google Play logo to static apps page; remove mailing list signup form 2015-12-12 11:32:17 +10:00
Sabe Jones
f6cdf5d257 chore(news): Android Bailey 2015-12-10 17:00:48 -05:00
Joy Clark
8756aeebfa fixing wolf sprite 2015-12-08 18:05:18 +01:00
joyclark
faf2611ca3 making change for peppermit heads. 2015-12-08 13:36:25 +01:00
Joy Clark
1769fc15f7 css files and sprite sheets 2015-12-08 13:22:13 +01:00
Sabe Jones
0f578b79ff feat(pets): Peppermint Hatching Potions 
Also fixes an issue where the pet hatching modal would appear when the user attempted to hatch a premium version of a quest pet.
 2015-12-04 17:20:33 -05:00
Blade Barringer
a3665e7095 chore(image): Add vice2 quest image 2015-12-04 07:46:02 -06:00
Sabe Jones
03222bf084 feat(content): Armoire and backgrounds 2015/12 2015-12-01 16:29:22 -05:00
Sabe Jones
046e7bcfdc chore(event): Revert NPCs 2015-11-27 13:10:54 -05:00
Sabe Jones
9cbe94c602 chore(gulp): compile sprites 2015-11-26 11:25:25 -05:00
Sabe Jones
29a84e6666 feat(event): Habitica Thanksgiving 2015-11-25 17:06:52 -05:00
Blade Barringer
1299afcb01 Merge branch 'develop' into gauthamchandra-feature/warning-for-disabled-js 2015-11-17 21:28:22 -06:00
Sabe Jones
c352a30d4e chore(news): Bailey 2015-11-16 
Also sprite recompile to incorporate sticker promo image.
 2015-11-16 17:26:44 -05:00
Gautham Chandra
b5e10bf1e9 Added a helpful message for when JS is disabled 2015-11-15 14:12:12 -05:00
Blade Barringer
efd0e2333e Merge pull request #6200 from gauthamchandra/feature/quick-checkout-from-dailies 
User can now check out of inn from tasks page
 2015-11-11 20:49:35 -06:00
Sabe Jones
83b61f9aa3 Merge branch 'develop' into sabrecat/pet-201511 
Conflicts:
	common/dist/sprites/spritesmith-main-5.css
	common/dist/sprites/spritesmith-main-5.png
	common/dist/sprites/spritesmith-main-6.css
	common/dist/sprites/spritesmith-main-6.png
	common/dist/sprites/spritesmith-main-7.css
	common/dist/sprites/spritesmith-main-7.png
	common/dist/sprites/spritesmith-main-8.css
	common/dist/sprites/spritesmith-main-8.png
	common/dist/sprites/spritesmith-main-9.css
	common/dist/sprites/spritesmith-main-9.png
 2015-11-11 18:36:25 -05:00
Sabe Jones
b32ab5a587 chore(news): Pet quest Bailey 
Also adds one missing sprite asset for the quest.
 2015-11-11 18:31:22 -05:00
Sabe Jones
eba2ac386e feat(pets): November quest 
Fully functional commit. Missing only Bailey and the quest scroll sprite.
 2015-11-11 17:23:16 -05:00
Sabe Jones
eed4207c6d Merge branch 'develop' into sabrecat/more-modals 
Conflicts:
	common/dist/sprites/spritesmith-largeSprites-0.png
	common/locales/en/front.json
 2015-11-09 16:24:17 -05:00
Gautham Chandra
b9b2536478 User can now check out of inn from tasks page 
Fixes #5651
 2015-11-07 18:32:19 -05:00
Sabe Jones
164309e050 feat(sharing): Streak Achievement 2015-11-06 16:54:23 -05:00
Sabe Jones
bb55a74f48 chore(news): iOS update Bailey 
Also fixes the color of the iOS app icon and codes it more intelligently.
 2015-11-05 11:48:51 -05:00
Sabe Jones
e74c83be2e feat(content): November backgrounds and Armoire 2015-11-02 17:28:20 -05:00
Sabe Jones
2cb4e80019 chore(event): End Fall Festival 2015-11-02 12:55:48 -05:00
Sabe Jones
68660b3043 Merge pull request #6140 from HabitRPG/sabrecat/habitoween 
WIP: Habitoween
 2015-10-30 14:46:44 -05:00
Sabe Jones
dca0d7c3f3 fix(event): Keep NPCs burnt out 2015-10-30 15:36:17 -04:00
Blade Barringer
724bc6e861 Compiled css for sprites 2015-10-30 10:10:12 -05:00
Sabe Jones
27d1e9c788 feat(event): Habitoween 
Swaps out basic fall costume NPCs for their Halloween versions. Removes "broken" NPC sprites not needed after World Boss.
 2015-10-29 14:15:18 -04:00
Sabe Jones
2df6df2bee Merge pull request #6091 from HabitRPG/sabrecat/mystery-201510 
October 2015 Subscriber Items
 2015-10-26 15:04:43 -05:00
Blade Barringer
fb30a7b03b Compile sprites. 2015-10-24 20:14:30 -05:00