krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,480 Commits 64 Branches 1,226 Tags
78cfbd2c6ac7e1a3d319f982ac0080f45ca19cec
Commit Graph

11480 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blade Barringer
6fdfe6c3bf Correct spelling of canBuy 2015-10-03 09:59:40 -05:00
Blade Barringer
a492649f71 Simplify gear tests and test more items 2015-10-03 09:59:10 -05:00
Blade Barringer
8eadecdc1a Improve testing around armor 2015-10-03 09:34:56 -05:00
Blade Barringer
393cc71309 Correct gold purchasable quests 2015-10-03 09:21:15 -05:00
Blade Barringer
495a3d3125 Add additional tests for quests 2015-10-03 09:21:06 -05:00
Blade Barringer
53a51ca3db Create helper function for testing items in object 2015-10-03 09:00:06 -05:00
Blade Barringer
36d7c59a0c Add backgrounds to content file 2015-10-03 06:49:14 -05:00
Blade Barringer
6dbfbeec81 Merge branch 'develop' into HabitRPG-sabrecat/backgrounds-201510 2015-10-03 06:40:50 -05:00
Blade Barringer
928e8478f7 Add coffeescript back in 2015-10-03 06:39:10 -05:00
Blade Barringer
655d8de7c8 chore(i18n): update locales 2015-10-02 22:28:12 -05:00
Blade Barringer
7a9bdfc9bf Correct base sets 2015-10-02 22:26:51 -05:00
Sabe Jones
56419aee25 feat(content): October 2015 backgrounds 2015-10-02 16:13:11 -04:00
Blade Barringer
36cbca380e Corrected order of backgrounds 2015-10-02 14:45:06 -05:00
Blade Barringer
bf7d6dddcc chore(i18n): update locales 2015-10-02 11:41:57 -05:00
Blade Barringer
c6c159a44c Add midnight shield back in 2015-10-02 11:40:42 -05:00
Blade Barringer
eb5e77cbb2 Fix locales for healAll 2015-10-02 10:34:54 -05:00
Blade Barringer
97ad1a8bb2 chore(i18n): update locales 2015-10-02 10:31:27 -05:00
Blade Barringer
339ab9e507 correct key to use mispelled version :/ 2015-10-02 10:11:20 -05:00
Blade Barringer
5a7662db09 Merge pull request #5976 from crookedneighbor/refactor-content 
Refactor Content Files
 2015-10-02 08:55:10 -05:00
Blade Barringer
a6453fec71 Merge pull request #6000 from Gondulf/develop 
Issue #5928 - Replaced 'link' with actual URL in faq.json
 2015-10-02 08:40:13 -05:00
Damien Gourbiere
17eff9ed84 Issue #5928 - Replaced 'link' with actual URL in faq.json 2015-10-02 08:56:25 -04:00
Blade Barringer
e07a99dc27 Export premium pets and mounts 2015-10-02 04:01:14 -05:00
Blade Barringer
e600791374 Merge pull request #5991 from tcyrus/patch-1 
Update README.md
 2015-10-01 23:01:36 -05:00
Blade Barringer
54c5741fca chore(i18n): update locales 2015-10-01 22:44:53 -05:00
Blade Barringer
4d682214c1 Merge pull request #5996 from Gondulf/develop 
Issue #5978 - Corrected grammar in gear.jason
 2015-10-01 22:40:43 -05:00
Blade Barringer
913faeba70 Remved unused readme 2015-10-01 22:38:58 -05:00
Damien Gourbiere
4df9299e25 Reverted change to the stirring stick description 2015-10-01 23:25:27 -04:00
Damien Gourbiere
c8b1c2622e Merge branch 'develop' of https://github.com/Gondulf/habitrpg into develop 2015-10-01 23:20:25 -04:00
Damien Gourbiere
d43242884f Issue #5978 - Corrected grammar in gear.jason 2015-10-01 23:09:24 -04:00
Blade Barringer
b4ce683190 Correct tests 2015-10-01 21:56:14 -05:00
Damien Gourbiere
1c0df66eed Issue #5978 - Corrected grammar in gear.jason 2015-10-01 22:45:25 -04:00
Blade Barringer
be3decf859 Merge branch 'develop' into refactor-content 2015-10-01 21:20:04 -05:00
Blade Barringer
a7fe29e04e Add comment to quest block 2015-10-01 17:26:21 -05:00
Sabe Jones
22c69c7e2f fix(magic-potions): Correct potion list merge 2015-10-01 16:53:11 -04:00
Sabe Jones
8e69681718 chore(news): Bailey 2015-10-01 2015-10-01 15:48:18 -04:00
Sabe Jones
5349bc7312 chore(gulp): Compile sprites 2015-10-01 14:27:21 -05:00
Sabe Jones
fc46023561 feat(armoire): October content 
(cherry picked from commit 2b2a85838dbc4539d41e6e2d508374b0960238d6)

Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith-main-3.png
	common/dist/sprites/spritesmith-main-4.css
	common/dist/sprites/spritesmith-main-4.png
	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-10-01 14:21:01 -05:00
Sabe Jones
f4c18bb7f3 chore(gulp): Compile sprites 2015-10-01 14:11:22 -05:00
Sabe Jones
233211adc9 Merge pull request #5962 from HabitRPG/sabrecat/magic-potions 
Magic Potions!
 2015-10-01 14:04:14 -05:00
Sabe Jones
3d38777ec8 fix(content): Correctly generate api.hatchingPotions 2015-10-01 14:54:52 -04:00
Sabe Jones
bebc4556ea Merge pull request #5992 from crookedneighbor/magic-potions-row 
Put magic pets on their own row
 2015-10-01 13:48:42 -05:00
Blade Barringer
0f8c3e03c2 Correct mount mixin 2015-10-01 13:25:00 -05:00
Blade Barringer
c8afac9580 Put magic pets on their own row 2015-10-01 13:21:15 -05:00
Blade Barringer
6667adb983 Reorder helper keys 2015-10-01 12:32:40 -05:00
Blade Barringer
86ec40e43d Add comment to gear file 2015-10-01 12:32:22 -05:00
Blade Barringer
3c933eaf4e Add comment to food file 2015-10-01 12:31:08 -05:00
Blade Barringer
ee2134dcb7 Add comment to eggs file 2015-10-01 12:30:51 -05:00
Blade Barringer
5f4aa427fc Add comment to pets and mounts file 2015-10-01 12:30:36 -05:00
Timothy Cyrus
ad6c0b322a Update README.md 
Change all Readme Badges to SVG's
 2015-10-01 08:53:47 -04:00
Blade Barringer
6c9fab254d Add coffeescript dependency back in 2015-09-30 22:49:19 -05:00