Commit graph

  • 4a16deb50d aLink mixin to handle mobile links Negue 2015-01-29 18:16:33 +0100
  • 01d695cae5 fix(grunt): allow caching of spritesheets, fix #4542 Matteo Pagliazzi 2015-01-29 17:59:30 +0100
  • e2cd4dca19 open external links Negue 2015-01-29 17:40:27 +0100
  • c9294897f7 Merge pull request #456 from Sporax/develop Blade Barringer 2015-01-29 10:06:55 -0600
  • 4aef4dfd0f Merge branch 'develop' into common-convert Blade Barringer 2015-01-29 09:23:10 -0600
  • c69e3195df updated capitalization of habit(s), daily, dailies Saagar Saini 2015-01-29 16:47:39 +0530
  • 154b8a00e5 Merge pull request #4585 from crookedneighbor/quest-scroll-popover-and-modal-changes Blade Barringer 2015-01-28 15:39:32 -0600
  • 5f1d138241 Added comment about questPopover function Blade Barringer 2015-01-28 15:38:41 -0600
  • 275f55cbfe Removed extra space Blade Barringer 2015-01-28 15:36:13 -0600
  • c328d0fd3c Removed hp from popover function Blade Barringer 2015-01-28 15:11:32 -0600
  • 043baf4961 Removed hp from modals Blade Barringer 2015-01-28 15:10:21 -0600
  • e6e1ea086e Fixed alignment of notes on tasks Blade Barringer 2015-01-28 14:51:51 -0600
  • d3d12bc638 Added popover-append-to-body to inventory popovers Blade Barringer 2015-01-28 14:23:38 -0600
  • 84552597d6 Adjusted hrs for popovers Blade Barringer 2015-01-28 14:00:06 -0600
  • 6acec132b0 Recompiled shared Blade Barringer 2015-01-28 13:53:19 -0600
  • 6def48e77e Merge pull request #455 from crookedneighbor/new-tasks-for-onboarding Blade Barringer 2015-01-28 13:52:12 -0600
  • 75eb6304eb Renamed variable name Blade Barringer 2015-01-28 13:51:03 -0600
  • 520df87362 fixed default todo note Blade Barringer 2015-01-28 13:50:11 -0600
  • 21be3e8957 Adjusted default tasks per lemoness Blade Barringer 2015-01-28 13:43:15 -0600
  • 4c6bf8f543 Added append to body to quest scroll popovers Blade Barringer 2015-01-28 13:37:34 -0600
  • 50bc48f325 fix(share): addthis in static pages Matteo Pagliazzi 2015-01-28 20:32:35 +0100
  • ca897d7cf3 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop Blade Barringer 2015-01-28 10:56:57 -0600
  • 23c31083ef Fixed triad count to actually check and make sure count is 90 Blade Barringer 2015-01-28 10:56:16 -0600
  • dca6880d13 chore(i18n): update locales Matteo Pagliazzi 2015-01-28 17:30:54 +0100
  • cd19ef9607 changed capitalization of 'dailies', 'daily', and 'habit(s)' Saagar Saini 2015-01-28 20:08:09 +0530
  • dc5f980083 fix(tasks): improve habit icon alignment benmanley 2015-01-28 13:24:49 +0000
  • 7ef0c70b8b Added placeholder blank notes Blade Barringer 2015-01-27 21:52:54 -0600
  • b890326545 Added new tasks for onboarding per lemoness Blade Barringer 2015-01-27 21:50:41 -0600
  • e19cf6b37f Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into develop Blade Barringer 2015-01-27 20:46:18 -0600
  • 70d3901000 New strings for quest modal Blade Barringer 2015-01-27 20:46:01 -0600
  • d8e09884a0 Added quest image and info to quest invitation modal Blade Barringer 2015-01-27 20:37:09 -0600
  • a77a46c543 Added one time bindings to quest modals Blade Barringer 2015-01-27 20:27:14 -0600
  • eaaa09c75a Added quest details to buy quest and show quest modals Blade Barringer 2015-01-27 20:16:11 -0600
  • 4e1716a8db Added hp to quest popover Blade Barringer 2015-01-27 20:15:28 -0600
  • b56c5af978 Changed popover text for quest scrolls. Closes #4575 Blade Barringer 2015-01-27 19:32:06 -0600
  • 5ba1e96b3c chore(i18n): update locales Matteo Pagliazzi 2015-01-27 20:36:03 +0100
  • 6a1e9e616d chore(grunt): grunt sprite Sabe Jones 2015-01-27 12:01:12 -0600
  • b8d9f047b1 fix(sprites): Rooster recolors Sabe Jones 2015-01-27 11:54:16 -0600
  • 0096873cf5 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop Blade Barringer 2015-01-27 09:47:03 -0600
  • 58650baba3 Merge branch 'issue#4556' of https://github.com/matttelliott/habitrpg into border Blade Barringer 2015-01-27 09:10:46 -0600
  • 42c0b443d7 fix(i18n): language selection working on static pages Matteo Pagliazzi 2015-01-27 15:48:57 +0100
  • 68573b1f31 Merge pull request #453 from Sporax/develop Alice Harris 2015-01-27 19:05:48 +1000
  • 2c40097403 move from left div to right Matt T Elliott 2015-01-26 23:14:19 -0800
  • 3a38bb849b add .border-left Matt T Elliott 2015-01-26 23:08:15 -0800
  • b9784fa4aa Added notice for rebirth in seasonal shop Blade Barringer 2015-01-26 22:15:24 -0600
  • 0c40b43013 Added rebirth notice for seasonal shop Blade Barringer 2015-01-26 22:15:05 -0600
  • 07870e1c7c Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert Blade Barringer 2015-01-26 19:36:38 -0600
  • 7eae5db256 Added comment describing the silly conditional for transparency in the seasonal shop Blade Barringer 2015-01-26 19:25:53 -0600
  • 3b1743dee8 Corrected ng-class condition to show transparent class on seasonal shop items after rebirth Blade Barringer 2015-01-26 18:55:10 -0600
  • c83a91886d Update questsContent.json Saagar Saini 2015-01-27 03:34:15 +0530
  • b469419c70 changed description for A stern talking-to from - habit to negative Habit Saagar Saini 2015-01-27 03:03:43 +0530
  • 0f5d2411b1 Adjust calculation of cronMP from checklists Verabird 2015-01-26 15:51:55 -0500
  • eceaaef954 Merge pull request #4567 from crookedneighbor/add-audio-watts Blade Barringer 2015-01-26 11:27:27 -0600
  • 9389899ed2 chore(grunt): grunt full Sabe Jones 2015-01-26 11:23:40 -0600
  • e70fce24f5 Merge pull request #451 from SabreCat/scrolls Sabe Jones 2015-01-26 11:20:29 -0600
  • 65af7f362e Merge branch 'scrolls' into develop Sabe Jones 2015-01-26 11:18:48 -0600
  • ad08f1be9a fix(news): Errant parenthesis Sabe Jones 2015-01-26 11:11:04 -0600
  • 524761f1cf feat(mystery): January subscriber set Sabe Jones 2015-01-26 11:00:02 -0600
  • e2f47651a4 feat(mystery): January subscriber set Sabe Jones 2015-01-26 10:59:29 -0600
  • 6ca9c10cda change some comments Alice Harris 2015-01-26 14:53:13 +1000
  • 5ced8800cd Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert Blade Barringer 2015-01-25 21:01:18 -0600
  • 9b5b83871f Refined triad Bingo calculation Blade Barringer 2015-01-25 21:00:34 -0600
  • 94ebf0db46 Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert Blade Barringer 2015-01-25 20:42:25 -0600
  • d9ecd41c1e Fixed mountCount calculation Blade Barringer 2015-01-25 20:26:51 -0600
  • 08ab6eba71 Converted shared to common in api test Blade Barringer 2015-01-25 15:54:19 -0600
  • 23f1dd59c5 Converted shared to common for controllers Blade Barringer 2015-01-25 15:26:37 -0600
  • 6472e04bd0 Changed shared to common for payments Blade Barringer 2015-01-25 15:22:04 -0600
  • af4f51857b Changed models to use common instead of shared Blade Barringer 2015-01-25 15:10:15 -0600
  • c5c0125c49 Converted routes to use common instead of habitrpg-shared Blade Barringer 2015-01-25 15:08:03 -0600
  • 1290581f39 Converted some files to use common instead of habitrpg-shared Blade Barringer 2015-01-25 15:05:15 -0600
  • 001d5560b3 Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert Blade Barringer 2015-01-25 14:58:20 -0600
  • 731589c0ea Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12 Alice Harris 2015-01-25 08:39:37 +1000
  • 65a03ead50 Merge pull request #450 from Verabird/decreaseMP Alice Harris 2015-01-25 08:34:26 +1000
  • ff0906a5c0 Fix completed todos counting as checked dailies and change unless-else to if-else Verabird 2015-01-24 12:07:39 -0500
  • 009255bdb5 fix(sprite): Improved Nameless Helm Sabe Jones 2015-01-24 10:57:24 -0600
  • baf092253d Merge pull request #448 from Verabird/decreaseMP Alice Harris 2015-01-24 17:29:58 +1000
  • 9ab86b536f adjusted comments Alice Harris 2015-01-24 16:46:18 +1000
  • a95522e165 create script to convert false to null in items.mounts for https://github.com/HabitRPG/habitrpg/pull/4374#issuecomment-71038795 Alice Harris 2015-01-24 16:04:46 +1000
  • dfb43af003 Merge branch 'common-convert' of github.com:HabitRPG/habitrpg into common-convert Blade Barringer 2015-01-23 15:30:28 -0600
  • 4588be29ee Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert Blade Barringer 2015-01-23 15:29:56 -0600
  • 72bc1cf40c Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into develop Blade Barringer 2015-01-23 15:29:36 -0600
  • 318dd506af Added watts theme string Blade Barringer 2015-01-23 15:29:00 -0600
  • 9f38ac86f7 Replaced blank death sound with actual sound files instead of blank files Blade Barringer 2015-01-23 15:27:57 -0600
  • 93c39e81bd Added death sound. Put blank versions in daniel theme Blade Barringer 2015-01-23 14:59:18 -0600
  • de59c76609 Added watts themes to audio choices Blade Barringer 2015-01-23 14:53:30 -0600
  • e8f6091764 chore(i118n): update locales Matteo Pagliazzi 2015-01-23 21:01:24 +0100
  • 412417505f feat(quests): Differentiated scrolls Sabe Jones 2015-01-23 10:40:32 -0600
  • 2ca6636c94 feat(quests): Differentiated scrolls Sabe Jones 2015-01-23 10:27:13 -0600
  • ec114d6a3e chore(news): Victory Bailey Sabe Jones 2015-01-23 10:20:50 -0600
  • 042f2fbceb Merge pull request #4498 from crookedneighbor/see-mp Blade Barringer 2015-01-22 11:57:15 -0600
  • 1e35bcb6ed Include checklist effect in cron MP gain and account for all gray dailies Verabird 2015-01-22 12:16:06 -0500
  • 37c7bd8df1 Removed shared form package and bower Blade Barringer 2015-01-21 11:00:12 -0600
  • db5082e0d7 Added shared dependencies to package.json Blade Barringer 2015-01-21 10:41:08 -0600
  • 590eded44a Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert Blade Barringer 2015-01-21 10:37:08 -0600
  • c91b0cd34a Moved folders into common directory Blade Barringer 2015-01-21 10:34:04 -0600
  • 350997d7b2 Add initial try for having undone dailies decrease gained MP Verabird 2015-01-19 14:43:16 -0500
  • 9d7fc1efbb chore(news): Stress Strike 3 Bailey Sabe Jones 2015-01-21 10:17:19 -0600
  • 5c8450ba1a Corrected triad bingo achievement for users that already had it Blade Barringer 2015-01-20 19:26:29 -0600
  • 32ed4dace7 Fixed triad bingo achievement not being awarded to people who already had it Blade Barringer 2015-01-20 19:24:46 -0600
  • 5246257f62 Merge pull request #4550 from HabitRPG/bailey-20150120 Blade Barringer 2015-01-20 17:06:14 -0600