Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,768 Commits 64 Branches 1,256 Tags
ee87d1b4b7eff6aafa9b41b86f6047728bd73fbc
Commit Graph

1233 Commits

Author SHA1 Message Date
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
Joy Clark 8756aeebfa fixing wolf sprite 2015-12-08 18:05:18 +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 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 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
Oliver Eyton-Williams dcd7cae312 Reverted changes related to multiple messages and changed handleTwoHanded to send single, clearer, messages. 2015-12-02 16:51:01 +01:00
Blade Barringer 6aa164ab31 chore(i18n): update locales 2015-12-02 07:42:29 -06:00
Sabe Jones 5b943b4ab9 feat(event): Enable GaymerX armor 2015-12-01 18:11:04 -05:00
Sabe Jones 03222bf084 feat(content): Armoire and backgrounds 2015/12 2015-12-01 16:29:22 -05:00
Sabe Jones 483ff8cb67 Merge pull request #6275 from TheHollidayInn/tasks-add-push-to-bottom 
Tasks add push to bottom
 2015-12-01 14:20:02 -06:00
Oliver Eyton-Williams da35eb6067 user.ops functions can now send multiple messages at once. Clearer messages are sent when equipping/unequipping two-handed weapons. 2015-12-01 18:24:23 +01:00
Alys c4f3c2b1f4 change website FAQ to link to Overview for New Users on website instead of wiki 2015-12-01 07:08:07 +10:00
Keith Holliday 0dcba276a6 Fixed task push text and move ctrlPressed logic to rootScope. 2015-11-28 12:06:34 -06:00
Sabe Jones 046e7bcfdc chore(event): Revert NPCs 2015-11-27 13:10:54 -05:00
Alys 9f53365648 add comment for refactoring to fix reset bug that doesn't unequip gear properly (e.g., https://github.com/HabitRPG/habitrpg/issues/6304) 2015-11-27 06:13:14 +10:00
Sabe Jones 5d02b70be1 Merge pull request #6264 from ojeytonwilliams/two-handed-weapon-fix 
Two-handed weapons no longer automatically equip unless desired. fixes #6231
 2015-11-26 10:53:50 -06:00
Sabe Jones 9cbe94c602 chore(gulp): compile sprites 2015-11-26 11:25:25 -05:00
Daniel Van Camp 98a62c5cc9 fix the phoenix base on the right place now 
(cherry picked from commit a8a2e3b74a)
 2015-11-26 11:22:57 -05:00
Sabe Jones 29a84e6666 feat(event): Habitica Thanksgiving 2015-11-25 17:06:52 -05:00
Sabe Jones 9671f4a09d feat(event): November sprites 2015-11-25 13:33:36 -06:00
Oliver Eyton-Williams 707cd08a8b Merged: updating two-handed tests to use arrow functions. 2015-11-25 12:12:22 +01:00
Alys e04066e45f Merge pull request #6228 from AminArria/timezone-information 
Timezone information
 2015-11-24 21:21:10 +10:00
Alys 69553260d3 revert refactor of preenHistory 2015-11-24 08:24:33 +10:00
Amin Arria 671d4aaecc Change timezone text 2015-11-23 11:38:26 -04:30
Blade Barringer 7d49a8cbf8 Merge branch 'develop' into HabitRPG-sabrecat/modularize-statHelpers 2015-11-23 08:07:58 -06:00
Keith Holliday b668829d85 Added ability to invert pushToBottom when holding down ctrl or cmd button 2015-11-22 15:57:14 -06:00
Alys 65c276c477 fix formatting in preenHistory 2015-11-22 21:08:51 +10:00
Alys 1082bb1f81 refactor preenHistory from index.js to cron.js 2015-11-22 15:52:30 +10:00
Alys 83ea085c21 refactor api.shouldDo and associated code; fix new bug in sanitizeOptions() 2015-11-22 11:28:51 +10:00
Alys 728a94d199 improve coding style 2015-11-22 11:05:03 +10:00
Alys a380c1aa30 refactor api.daysSince to a cron.js function not exposed on api 2015-11-22 10:48:15 +10:00
Alys 2f8b6d68e8 refactor api.startOfDay to a cron.js function not exposed on api 2015-11-22 07:13:44 +10:00
Alys 6183fd9e71 refactor api.startOfWeek to a cron.js function not exposed on api 2015-11-21 22:26:05 +10:00
Alys e0784a9791 refactor sanitizeOptions from index.js to cron.js 2015-11-21 22:06:02 +10:00
Alys a73662bab6 refactor api.dayMapping to DAY_MAPPING const, not exposed on api 2015-11-21 20:48:18 +10:00
Sabe Jones fb17c3ae80 Merge branch 'develop' into sabrecat/modularize-statHelpers 2015-11-20 13:27:25 -05:00
Sabe Jones 72ea9426dd fix(lint): Space infix operator (?) 2015-11-18 15:18:44 -05:00
Sabe Jones ed443b490a refactor(constant): Screaming camel MAX_LEVEL 2015-11-18 15:14:47 -05:00
Sabe Jones 31b68219d1 refactor(stats): Address PR comments 2015-11-18 15:06:55 -05:00