269 Commits

Author	SHA1	Message	Date
Sabe Jones	00a212660a	feat(greeting-cards): Thank-You & Greets	2015-08-13 16:58:31 -05:00
Sabe Jones	f57e3e69a1	WIP(greeting-cards): Working send + modals	2015-08-13 15:43:51 -05:00
Sabe Jones	b2100c2c54	WIP(greeting-cards): Abandon spell refactor	2015-08-13 14:31:34 -05:00
Blade Barringer	39ead02d6c	Remove comment	2015-08-12 19:09:11 -05:00
Blade Barringer	bcf7c9712e	Split out potion and armoire out of the itemStore object ... Fixes #5743	2015-08-12 18:53:49 -05:00
Blade Barringer	203a26b6df	Refactor how cards are recieved	2015-08-12 08:36:57 -05:00
Sabe Jones	beacce7fe0	Merge branch 'develop' into sabrecat/party-page	2015-08-10 13:43:44 -05:00
Sabe Jones	28ae6afd92	WIP(party-page): UI draft	2015-08-10 13:42:36 -05:00
Alys	fd0176f4fc	fix an outdated comment	2015-08-09 14:09:10 +10:00
Alys	262340147d	remove code that was added purely for testing and development	2015-08-09 14:08:28 +10:00
Alys	06fd9c7a67	replace _.times with for loop to allow break	2015-08-09 13:58:18 +10:00
Alys	c3d65f0bcf	initial changes to cause cron to count multiple missed days as one missed day	2015-08-09 13:58:18 +10:00
Blade Barringer	383ae3be55	Merge pull request #5746 from crookedneighbor/enchanted_armoire_test_improvements ... Enchanted armoire test improvements	2015-08-05 18:13:12 -05:00
Blade Barringer	e22e853f21	Fix some formatting	2015-08-05 08:18:03 -05:00
Blade Barringer	008a5f1209	Merge branch 'develop' of github.com:HabitRPG/habitrpg into vIiRuS-armoireResponse	2015-08-04 19:52:11 -05:00
Sabe Jones	60e65a8bea	feat(armoire): August additions ... Also includes the August backgrounds and upgrades the "restock Armoire" migration to use @Alys's progressive output script.	2015-08-04 12:45:01 -05:00
Sabe Jones	ceb9cf7817	WIP(event): Habitica Day	2015-07-28 16:20:08 -05:00
Sabe Jones	13ab60cafe	feat(drops): Enable pets at Level 3	2015-07-28 13:28:45 -05:00
Alys	f5c66e51d1	refactor cron process for todos and dailys to give them separate code	2015-07-26 11:27:00 +10:00
Blade Barringer	791e2f0c16	Add method to get user balance in gems	2015-07-24 17:30:38 -05:00
Blade Barringer	fca6f91f13	Merge branch 'develop' into analytics-service-server-side	2015-07-24 15:19:31 -05:00
Sabe Jones	d32d05e873	feat(mystery): July 2015 goodies ... Also makes the mystery box opening notification translatable and adds item graphics to it.	2015-07-23 12:05:13 -05:00
Blade Barringer	bfd56b35e1	Revert armoire counting code back to old system ... @TODO: work out why it's hpapening and unpend test for new system	2015-07-23 08:43:08 -05:00
Blade Barringer	c41271e558	Merge branch 'develop' into refactor_member_modal_and_stats_page	2015-07-22 17:39:39 -05:00
Blade Barringer	7b9102c88c	Move gear counting to counting script	2015-07-22 17:37:35 -05:00
Blade Barringer	f40cfd2b66	Move all pet counting to shared count scripts	2015-07-22 17:32:12 -05:00
Blade Barringer	063e53b0ea	Added function to count pets that are actually owned	2015-07-21 20:14:15 -05:00
Blade Barringer	20660f50c0	Add count function for remaining items in gear set	2015-07-21 18:06:07 -05:00
Blade Barringer	73e1764413	Move beast/mount master counts to separate file	2015-07-21 08:13:50 -05:00
Blade Barringer	3d40da4004	Remove countPets and countMounts from codebase	2015-07-20 08:11:00 -05:00
Blade Barringer	2695419182	Use better beastMaster / mountMaster counts	2015-07-19 21:51:30 -05:00
Blade Barringer	054d884154	Merge branch 'develop' into analytics-service-server-side	2015-07-19 10:13:34 -05:00
Blade Barringer	a950339f01	Clarify cron	2015-07-19 08:41:45 -05:00
Blade Barringer	f9304bd28f	Move stat calc scripts to angular service	2015-07-18 16:00:06 -05:00
Blade Barringer	3926a6e95a	Remove unnecssary semicolons	2015-07-18 16:00:06 -05:00
Blade Barringer	2b4e48fbe6	Add stat calc to common	2015-07-18 16:00:05 -05:00
Blade Barringer	163b0545e8	Adjustments for error handling	2015-07-18 16:00:04 -05:00
Blade Barringer	6d5b57d139	Add class bonus calc function	2015-07-18 16:00:04 -05:00
Blade Barringer	e5428f29c1	Add calculation for equipment stat bonus	2015-07-18 16:00:04 -05:00
Blade Barringer	841923e054	Add level bonus calculation script	2015-07-18 16:00:03 -05:00
Sabe Jones	ffc441ab82	feat(quests): Improve drop notif	2015-07-16 16:22:49 -05:00
Alys	d8e7108098	moved twoHanded:true out of bracketed region in rancherLasso - it was causing "Error processing the string"	2015-07-15 14:56:57 +10:00
Sabe Jones	266b6b87e2	test(quests): Quests Service spec WIP ... First test on new Quests Service. Also fix Armoire tests to account for new items.	2015-07-13 19:16:29 -05:00
Sabe Jones	b9f795529b	feat(quests): Dilatory Distress ... Implements the "Dilatory Distress" quest chain, purchasable for Gold. Also adds four new items to the Enchanted Armoire.	2015-07-13 18:21:32 -05:00
Blade Barringer	87f5449267	Merge branch 'develop' into quests-fix-merge-coflicts	2015-07-13 08:20:52 -05:00
Blade Barringer	cb992e1083	Added category to whale quest	2015-07-12 21:16:49 -05:00
Matteo Pagliazzi	4b170cd4dc	chore(i18n): update locales	2015-07-12 23:45:26 +02:00
Blade Barringer	316c3e9c2e	Sort out conflicts from develop	2015-07-12 13:51:42 -05:00
Blade Barringer	74de248109	Adjust how quest drops are sent	2015-07-12 10:05:00 -05:00
Blade Barringer	284fa03223	Add platform, change itemName to itemKey	2015-07-12 10:03:41 -05:00