sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-04 01:29:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
11792 commits 3 branches 0 tags 1.6 GiB
Commit graph

11792 commits

This branch
This branch
All branches
Author SHA1 Message Date
Blade Barringer
ce06d8a873 tests(common): Simplify spell tests 2015-12-13 15:37:18 -06:00
Keith Holliday
f152a352bb Merge pull request #4 from crookedneighbor/common_helper 
Common helper
 2015-12-13 12:06:22 -06:00
Blade Barringer
4ee21f2578 tests(common): Use helper to generate user 2015-12-13 10:40:50 -06:00
Blade Barringer
70751abe01 tests(helpers): Add helper to generate user for common and content tests 2015-12-13 10:40:00 -06:00
Blade Barringer
dafe014ec8 Merge branch 'develop' into TheHollidayInn-skills-burst-backstap-leveling-fix 2015-12-13 10:06:27 -06:00
Keith Holliday
beea6d920f Added tests for backstab and fireball 2015-12-13 09:19:20 -06:00
Blade Barringer
5fa91713f5 fix(favicon): Add 192x192 image 2015-12-12 20:11:25 -06:00
Blade Barringer
025b302ec6 Merge branch 'develop' into anilanar-favicon192 2015-12-12 20:08:34 -06:00
Blade Barringer
530babf516 chore(css): Add explanation for empty-task-notification rule 2015-12-12 17:27:43 -06:00
Blade Barringer
73c8db01ad chore(sprites): Update readme 2015-12-12 17:17:04 -06: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
Blade Barringer
a7ffb41acd fix(sprites): Correct size of tiger mount icon 2015-12-12 16:04:03 -06:00
Blade Barringer
1f37338782 fix(sprites): Correct mount head icons for peppermint pets 2015-12-12 14:35:14 -06:00
Blade Barringer
6d6e1caf0f fix(sprites): Correct spooky pet mount icons 2015-12-12 14:20:38 -06:00
Blade Barringer
8ad2b07253 fix(sprites): Correct gryphon mount icon sizing 2015-12-12 11:09:27 -06:00
Blade Barringer
9aa73db281 fix(sprites): Correct size of tiger sprites 2015-12-12 11:02:54 -06:00
Blade Barringer
963995e42e refactor(css): Adjust mount heads pixel paw positioning 2015-12-12 10:50:05 -06:00
Alys
10a63a6cb7 make Android link in footer open in new tab 2015-12-12 18:59:44 +10:00
Alys
95dbcde4b6 change Android link in footer to point to Google Play 2015-12-12 18:33:36 +10:00
Blade Barringer
c0e2520bb3 Merge pull request #6365 from VirenMohindra/updated-readme 
removed gymnasium dependency status
 2015-12-11 20:29:11 -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
Viren Mohindra
3c08a26312 removed gymnasium dependency status 
broken link- no point in keeping it in the readme
 2015-12-11 20:24:49 -05:00
Sabe Jones
f6cdf5d257 chore(news): Android Bailey 2015-12-10 17:00:48 -05:00
Alys
cf01376f7d adjust forgot password text to specify that you must use the website - fixes https://github.com/HabitRPG/habitrpg-android/issues/170 2015-12-11 06:39:03 +10:00
Sabe Jones
33f5dda99a Merge pull request #6351 from HabitRPG/sabrecat/docker 
Overhauled Dockerfile
 2015-12-09 15:56:01 -06:00
Sabe Jones
1bd9582b2c refactor(Dockerfile): more readable comments re IP 2015-12-09 16:32:39 -05:00
Sabe Jones
816ce5b782 feat(Docker): overhauled Dockerfile 2015-12-09 16:23:47 -05:00
Matteo Pagliazzi
c5b7873406 add support for habitica-android in x-client header 2015-12-09 11:02:26 +01:00
Joy Clark
8756aeebfa fixing wolf sprite 2015-12-08 18:05:18 +01:00
joyclark
91fe5fed97 Merge remote-tracking branch 'origin/new_mount_heads' into new_mount_heads 
Conflicts:
	common/dist/sprites/spritesmith-main-10.css
	common/dist/sprites/spritesmith-main-10.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-12-08 13:43:49 +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
Joy Clark
7628882f24 use new css class 2015-12-08 13:22:13 +01:00
Joy Clark
d8b0774618 Add Mount_Icon images 2015-12-08 13:22:12 +01:00
Sabe Jones
3385cb807e Merge pull request #6334 from bennyty/develop 
Normalize theme audio volumes
 2015-12-07 18:33:39 -06:00
Sabe Jones
7472d17c3a Merge pull request #6335 from HabitRPG/sabrecat/peppermint-pets 
Peppermint Hatching Potions
 2015-12-07 15:18:42 -06:00
Sabe Jones
dd4ca5c476 refactor(modals): More readable invalid hatch check 2015-12-07 16:00:52 -05:00
Joy Clark
7f2496b397 css files and sprite sheets 2015-12-06 00:16:36 +01:00
Joy Clark
1b50197610 use new css class 2015-12-05 23:26:50 +01:00
Joy Clark
545a802a03 Add Mount_Icon images 2015-12-05 23:17:44 +01:00
Joy Clark
144e3003bb Add Mount_Icon images 2015-12-05 23:17:39 +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
bennyty
ed944f83bf Rebalance audio themes 2015-12-04 13:39:29 -05:00
Blade Barringer
a3665e7095 chore(image): Add vice2 quest image 2015-12-04 07:46:02 -06:00
Sabe Jones
aa00eae0d5 Merge pull request #6324 from ojeytonwilliams/unequip-notification-fix 
Unequip notification fix
 2015-12-03 14:01:45 -06:00
Oliver Eyton-Williams
36df8138fc Fixed template syntax. 2015-12-03 13:33:52 +01:00
Alys
d63cf64944 allow Fetch Recent Messages button to appear on newly-created groups 2015-12-03 10:03:59 +10:00
Alys
e907e2e4ee adjust test for IAP GooglePlay to specify 21 gems 2015-12-03 07:23:31 +10:00
Alys
904dd595ed change Google iap-live for Android mobile app gem purchases, at negue's request 2015-12-03 06:22:59 +10:00