1198 Commits

Author	SHA1	Message	Date
Sabe Jones	22c69c7e2f	fix(magic-potions): Correct potion list merge	2015-10-01 16:53:11 -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
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
Blade Barringer	faf5d263e0	Correct gear sets	2015-09-30 20:12:14 -05:00
Blade Barringer	b96d3fc3fc	Add special back	2015-09-30 19:50:57 -05:00
Blade Barringer	3be24456ec	Move special and armoire gear to own module	2015-09-30 19:04:09 -05:00
Sabe Jones	9afaa92c2e	feat(magic-potions): Clarify drop behavior	2015-09-30 15:31:09 -04:00
Blade Barringer	0199dcadf3	Add armoire set	2015-09-29 21:38:45 -05:00
Blade Barringer	c56e7ba44e	Move base euqipment to own module	2015-09-29 17:58:37 -05:00
Blade Barringer	ff4dae8f89	Move mystery set into own module	2015-09-29 17:53:32 -05:00
Blade Barringer	e9a4465a4c	Merge branch 'develop' into refactor-content	2015-09-29 17:30:33 -05:00
Blade Barringer	5c0a0e1d18	Compile css	2015-09-29 17:30:08 -05:00
Blade Barringer	8676e660a8	Correct rogue shield	2015-09-29 12:20:57 -05:00
Blade Barringer	bc47d44acc	Add in text for evil santa quests	2015-09-29 08:00:53 -05:00
Blade Barringer	2db4b7b7b2	Move i18n to javascript	2015-09-28 17:33:45 -05:00
Sabe Jones	ffe0cff7cd	fix(drops): Pick drop eggs from dropEggs	2015-09-28 16:28:59 -04:00
Sabe Jones	feff6fadfa	feat(magic-potions): Final tweaks	2015-09-28 14:58:46 -04:00
Blade Barringer	b8a8eff434	Merge branch 'develop' into refactor-content	2015-09-28 12:45:18 -05:00
Blade Barringer	2d862593ae	Compile sprites	2015-09-28 08:50:20 -05:00
Blade Barringer	d1faa50e5e	Merge branch 'develop' into refactor-content	2015-09-28 07:52:02 -05:00
Blade Barringer	bc46609fbc	Use shorthand function syntax	2015-09-28 07:44:31 -05:00
Blade Barringer	86fd9cf32a	Extract base into separate set	2015-09-27 09:59:29 -05:00
Blade Barringer	8bc70150c2	Remove unused module	2015-09-27 09:54:37 -05:00
Blade Barringer	43fbe23b05	Extract rogue gear into set	2015-09-27 09:53:43 -05:00
Blade Barringer	5d1a22848a	Extra healer into set file	2015-09-27 09:47:59 -05:00
Blade Barringer	5a44d266f8	Extract wizard content to set file	2015-09-27 09:38:02 -05:00
Blade Barringer	3e335b591c	Rewrite gear helper to take a whole set	2015-09-27 09:23:26 -05:00
Blade Barringer	40fc03263d	Reformate warrior content file	2015-09-27 09:11:40 -05:00
Blade Barringer	5652a47290	Move quest set defaults to helpers	2015-09-26 17:03:22 -05:00
Blade Barringer	70b68707b5	Move quest defaults function to helpers	2015-09-26 16:10:17 -05:00
Blade Barringer	6d7a7b2500	Add missing semi-colons	2015-09-26 16:04:11 -05:00
Blade Barringer	3ca761eccb	Collect default and generator functions	2015-09-26 16:02:11 -05:00
Blade Barringer	f73d1d35ee	Collect translator functions together	2015-09-26 15:58:54 -05:00
Alys	6902d9aa2f	swap README files for en and zk. What WAS I thinking?	2015-09-27 06:52:23 +10:00
Alys	7b4c50bdb7	update locales edit/translate instructions	2015-09-27 06:13:56 +10:00
Blade Barringer	cc6117fd17	Refactor eggs	2015-09-25 17:53:58 -05:00
Blade Barringer	bd8d9415e0	Move hatching potion tranform to helpers	2015-09-25 17:53:43 -05:00
Blade Barringer	68cd51fbb0	Move egg function to helpers	2015-09-25 17:34:17 -05:00
Blade Barringer	373f2757ca	Move background function to helpers	2015-09-25 17:16:30 -05:00
Sabe Jones	38bdbf020b	feat(content): Generalize canBuy	2015-09-25 15:01:08 -04:00
Blade Barringer	77d75c164e	Use helper for backgrounds	2015-09-25 12:59:38 -05:00