Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,677 Commits 64 Branches 1,256 Tags
6f85fcfde282f319a2e2c2d7d7a2e8376adba0a6
Commit Graph

238 Commits

Author SHA1 Message Date
Sabe Jones 6f85fcfde2 Merge branch 'develop' into sabrecat/party-page 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith0.png
	common/dist/sprites/spritesmith2.png
	common/dist/sprites/spritesmith3.css
	common/dist/sprites/spritesmith3.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png
 2015-09-01 13:40:20 -05:00
Sabe Jones 5ba6cfc2f5 feat(content): September content adds 2015-08-31 18:16:54 -04:00
Blade Barringer 15a6929b44 Merge branch 'develop' into sabrecat/party-page 2015-08-28 08:41:57 -05:00
Alys 049f9280a2 Merge pull request #5798 from Alys/rebirth-keeps-free-gear-2015-08-12 
prevent Orb of Rebirth from removing free gear (equipment that has zero gold cost) - partial fix for https://github.com/HabitRPG/habitrpg/issues/5750
 2015-08-26 22:01:29 +10:00
Alys bbcb9e6063 fix problem of Cheetah Costume Set mystery items not staying put -- code is ugly, improve later 2015-08-25 19:23:25 +10:00
Sabe Jones 9ed1e2ba6d fix(mystery): Force coffee compile 2015-08-24 23:37:54 -05:00
Sabe Jones d70aa46ec1 fix(mystery): Adjust date range 2015-08-24 21:33:02 -05:00
Sabe Jones c23312f771 feat(mystery): 2015 August items 2015-08-24 17:19:12 -04:00
Blade Barringer 65888d3f8a Merge branch 'develop' into sabrecat/party-page 2015-08-20 07:39:25 -05:00
Sabe Jones 190fdd5bb9 feat(pets): August cheetah quest 2015-08-19 16:55:14 -04:00
Blade Barringer f792155b45 Order quests with array 2015-08-17 21:48:58 -05:00
Blade Barringer 344eded949 Merge branch 'develop' into sabrecat/party-page 2015-08-17 19:04:25 -05:00
Alys 57e7fc93d7 prevent Orb of Rebirth removing free equipment (gear that has zero gold cost) - partial fix for https://github.com/HabitRPG/habitrpg/issues/5750 2015-08-16 12:33:40 +10:00
Alys 7f0889f405 remove commented-out default task code and unused default task locale strings - fixes https://github.com/HabitRPG/habitrpg/issues/5631#issuecomment-130619901 (comment by GitHubSphinx) 2015-08-15 13:23:42 +10:00
Sabe Jones 0f31873262 Merge branch 'develop' into sabrecat/party-page 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith1.css
	common/dist/sprites/spritesmith1.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png
	website/views/options/social/index.jade
 2015-08-14 11:23:35 -05:00
Blade Barringer 998e336818 Remove extraneous white space 2015-08-14 07:40:07 -05:00
Blade Barringer 6be339fc77 Fix bug where armoire notes would not display correctly 2015-08-14 06:59:23 -05:00
Blade Barringer 576688c15b Clean up content file 2015-08-14 06:41:10 -05:00
Sabe Jones ab91a6fba9 Merge pull request #5781 from HabitRPG/sabrecat/greeting-cards 
Greeting and Thank-You Cards
 2015-08-13 22:35:25 -05:00
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