Commit graph

  • 8b1ba48bfe Merge branch 'mountmaster' into triad-bingo Blade Barringer 2015-01-16 16:53:35 -0600
  • d9fed69147 Corrected releasBoth function to reset current pet and deduct the correct amount of gems Blade Barringer 2015-01-16 16:52:59 -0600
  • e25472759a Added triad bingo achievment Blade Barringer 2015-01-16 16:43:48 -0600
  • 7860819ee3 Added shell for awarding triad bingo Blade Barringer 2015-01-16 12:27:51 -0600
  • 5b2c4d5a09 Compiled css Blade Barringer 2015-01-16 12:23:25 -0600
  • 1460e5762e Added sprite Blade Barringer 2015-01-16 12:15:22 -0600
  • d4d18dcee5 Added triad bingo achievement Blade Barringer 2015-01-16 12:14:51 -0600
  • ca1f4890ea Corrected icon for triad bingo Blade Barringer 2015-01-16 11:55:23 -0600
  • 3ba057258f Added triad bingo achievement modal Blade Barringer 2015-01-16 11:49:19 -0600
  • 3625cf514e Added triad bingo achievement test Blade Barringer 2015-01-16 11:49:00 -0600
  • e5b6e64a98 Added preliminary logic for opening triadBingo modal Blade Barringer 2015-01-16 11:47:07 -0600
  • cecb2792e0 Added logic so triad bingo only appears in achievements after mount master has been reached Blade Barringer 2015-01-16 11:41:36 -0600
  • cbdd30b25f Merge branch 'mountmaster' into triad-bingo Blade Barringer 2015-01-16 11:40:36 -0600
  • 6a63f55a94 Added logic so muted version of mount master only appears if user has achieved beast master Blade Barringer 2015-01-16 11:37:20 -0600
  • ff4c2ade96 Added triadBingo to achievement list Blade Barringer 2015-01-16 11:32:41 -0600
  • e565bf7896 Added initial strings for triad bingo Blade Barringer 2015-01-16 11:25:49 -0600
  • e8b6779be6 Merge branch 'mountmaster' of github.com:HabitRPG/habitrpg-shared into mountmaster Blade Barringer 2015-01-16 10:47:50 -0600
  • 75cf2a4788 Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into mountmaster Blade Barringer 2015-01-16 10:46:59 -0600
  • c301bd3e89 fix(console): remove console.log Matteo Pagliazzi 2015-01-16 17:46:47 +0100
  • 10bc7e4eac Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster Blade Barringer 2015-01-16 10:44:52 -0600
  • 9a087d2d90 update angular and do not send api key to loggly Matteo Pagliazzi 2015-01-16 17:39:47 +0100
  • 73d684987e chore(grunt): compile Matteo Pagliazzi 2015-01-16 17:33:44 +0100
  • 4a22b1dc57 fix(sync): fix for when data is null, ie. server offline Matteo Pagliazzi 2015-01-16 17:33:15 +0100
  • 290e602f21 Added brackets to quest.boss check. Closes #4526 Blade Barringer 2015-01-16 10:22:47 -0600
  • 1f1cd750cb chore(i18n): update locales Matteo Pagliazzi 2015-01-16 17:16:48 +0100
  • c1d1d7d4a5 chore(grunt): grunt full Sabe Jones 2015-01-15 16:52:59 -0600
  • 94d003ca5d Merge pull request #4524 from SabreCat/develop Sabe Jones 2015-01-15 16:41:07 -0600
  • 3e17834b5d Merge pull request #440 from SabreCat/develop Sabe Jones 2015-01-15 16:39:38 -0600
  • 35e8097b0c refactor(challenges): wrap group.challenges as $resources, so they're convenience functions $join/$leave/etc can be called directly Tyler Renelle 2015-01-15 15:24:02 -0700
  • 5c28730dc1 markdown timeoutTime attribute Negue 2015-01-15 22:53:47 +0100
  • c260362d96 feat(quest): T-Rex pet Sabe Jones 2015-01-15 15:45:56 -0600
  • 0b63e48c6e feat(quest): T-Rex pet Sabe Jones 2015-01-15 15:38:51 -0600
  • f9b507e782 changed links to relative, corrected mailto link scribblypanda 2015-01-15 08:23:23 -0500
  • 9fe93351ae applied .muted to text so less cluttered looking scribblypanda 2015-01-14 22:38:02 -0500
  • 273dc4909f Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into issue4468 scribblypanda 2015-01-14 22:29:07 -0500
  • 8a2e9caca9 chore(i18n): update locales Matteo Pagliazzi 2015-01-14 19:53:17 +0100
  • ce1c0d9008 Merge pull request #438 from crookedneighbor/prevent-type-changing Matteo Pagliazzi 2015-01-14 19:41:44 +0100
  • 1c771fa4db fixed bug where +habits would behave strangely when targeted by spells etaiklein 2015-01-14 02:06:41 -0500
  • 2bd1af587b Compiled coffeescript Blade Barringer 2015-01-13 20:18:06 -0600
  • a805b4f0c9 Brought in lefnire's change so type cannot be changed on updateTask Blade Barringer 2015-01-13 20:17:36 -0600
  • cb835f97b2 Merge pull request #437 from taldin/mountmaster-modal-edit-from-taldin Blade Barringer 2015-01-13 19:55:43 -0600
  • 150909cc95 Rewritten modal Taldin 2015-01-13 11:31:02 -0800
  • 17ab1d660f chore(news): Stress Strike 1 Bailey Sabe Jones 2015-01-13 13:29:10 -0600
  • 4e50c43da2 fix(world-boss): Scale based on current HP Sabe Jones 2015-01-13 13:19:38 -0600
  • 04ff888819 fix(world-boss): Scale based on current HP Sabe Jones 2015-01-13 13:19:04 -0600
  • f00e1bc660 Merge pull request #4510 from SabreCat/stressbeast Sabe Jones 2015-01-13 12:06:12 -0600
  • 625d1dfbed Merge pull request #436 from SabreCat/stressbeast Sabe Jones 2015-01-13 12:04:42 -0600
  • a2be1bc472 fix(world-boss): Bit stronger healing Sabe Jones 2015-01-13 12:00:06 -0600
  • 480b4e2764 feat(world-boss): Healing on rage Sabe Jones 2015-01-13 11:50:15 -0600
  • ad7c02d50d feat(world-boss): Healing on rage Sabe Jones 2015-01-13 11:49:16 -0600
  • ddff5afda7 Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into mountmaster Blade Barringer 2015-01-12 21:50:57 -0600
  • 385fe36a0a Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster Blade Barringer 2015-01-12 21:50:14 -0600
  • 41364f6c59 modified login/display name info to be more descriptive scribblypanda 2015-01-12 21:45:58 -0500
  • 9456653263 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into issue4468 scribblypanda 2015-01-12 21:36:44 -0500
  • 86c25085fc Merge remote-tracking branch 'upstream/develop' into fix-chat-visibility-2015-01-13 Alice Harris 2015-01-13 07:53:52 +1000
  • 0bd22e7c77 disallow fetching of chat messages Alice Harris 2015-01-13 06:10:46 +1000
  • f1e354ba0e Added string for both beast master and mount master Blade Barringer 2015-01-12 13:12:50 -0600
  • 1557907a1c Updated string names Blade Barringer 2015-01-12 13:12:40 -0600
  • 1fd068ae89 Corrected capitalization Blade Barringer 2015-01-12 13:09:51 -0600
  • c7d8c40b0b Updated strings to use master instead of abreviated mast Blade Barringer 2015-01-12 12:58:55 -0600
  • ca2d45113c fix(billing): script to fix current_period_end, see #4420 Tyler Renelle 2015-01-12 11:50:46 -0700
  • 45ae1ec7d6 changed display name description to be consistent with login name description scribblypanda 2015-01-11 20:31:52 -0500
  • 8e3e66dc08 added description of login name and link to page to edit display name scribblypanda 2015-01-11 20:30:25 -0500
  • 6c99bbc948 added translatable strings for login name description scribblypanda 2015-01-11 20:29:36 -0500
  • a505d88452 added translatable strings for display name description scribblypanda 2015-01-11 20:17:36 -0500
  • 393ef6b1f4 added description of display name and link to page to edit login name scribblypanda 2015-01-11 20:17:05 -0500
  • b4a62d76b7 Corrected beastmaster to beast master Blade Barringer 2015-01-11 18:28:32 -0600
  • 995daee88d Corrected camel casing of beastMaster and mountMaster Blade Barringer 2015-01-11 18:27:04 -0600
  • a72ae097d6 Corrected how count is calculated Blade Barringer 2015-01-11 18:23:27 -0600
  • f6885427a8 Corrected Beast Master and Mount Master count so it would be accurate. Blade Barringer 2015-01-11 17:24:01 -0600
  • 11f20555c4 Corrected stats page to show profile data instead of user data Blade Barringer 2015-01-11 17:23:30 -0600
  • ccb1c4cd99 split emailChange message into 3 parts scribblypanda 2015-01-11 13:18:39 -0500
  • 684c6a997d fixed emailChange message, displays properly on localhost scribblypanda 2015-01-11 13:18:00 -0500
  • faf69fca8d added new translatable strings, mailto link scribblypanda 2015-01-11 10:37:16 -0500
  • d560bacd32 plain text to translatable strings scribblypanda 2015-01-11 10:36:14 -0500
  • 9907379a60 plain text to translatable strings scribblypanda 2015-01-11 10:22:24 -0500
  • d9cb197d95 added new translatable string emailChange scribblypanda 2015-01-11 03:31:32 -0500
  • 9aca62a53d added new translatable string emailChange scribblypanda 2015-01-11 03:21:53 -0500
  • 998fe684e4 added new translatable string emailChange scribblypanda 2015-01-11 03:20:22 -0500
  • c3fce5fcba changed Username to Login Name scribblypanda 2015-01-11 01:18:37 -0500
  • 7b9514dc5d fix final bit of conflict Alice Harris 2015-01-11 14:54:41 +1000
  • 27dab4ae4e Merge remote-tracking branch 'upstream/develop' into todos-dated-tab-2014-11-01 Alice Harris 2015-01-11 14:18:37 +1000
  • 7660141365 Merge remote-tracking branch 'upstream/develop' into todos-dated-tab-2014-11-01 Alice Harris 2015-01-11 14:15:55 +1000
  • 9e9b5dbb20 Merge pull request #433 from Verabird/BuffSkillsAgain Alice Harris 2015-01-11 12:04:10 +1000
  • b0fc2a8e7c Merge pull request #434 from Alys/develop Alice Harris 2015-01-11 11:06:48 +1000
  • 4e2a79e69c change G to Gem to remove confusion with Gold Alice Harris 2015-01-11 10:58:47 +1000
  • c9f5113daa Merge pull request #4486 from kangabell/spell-active-highlight Blade Barringer 2015-01-10 11:59:35 -0600
  • 22446a5ddb apply active class to special spells too K. Belardinelli 2015-01-10 11:06:39 -0500
  • 09c3b643bd Removed comment because bug was fixed Blade Barringer 2015-01-10 09:54:49 -0600
  • 1e11947c9e Removed unnecessary comment Blade Barringer 2015-01-10 09:52:51 -0600
  • 819ab0b6e1 Added updated mountCount to releaseBoth function Blade Barringer 2015-01-10 09:52:09 -0600
  • a24fad40ca Removed unused pieces of text Blade Barringer 2015-01-10 09:39:23 -0600
  • 1c0520c94d Removed link to picture of all pets, since it is now inaccurate and there is no corresponding one for mounts Blade Barringer 2015-01-10 09:38:03 -0600
  • d6dc2119cb add active class to spell item when it is selected K Bell 2015-01-08 19:55:49 -0500
  • 0f2adcad14 highlight spell item when it has class of 'active' K Bell 2015-01-06 11:44:44 -0500
  • 83d91dfe34 Merged in changes from develop and re-ran grunt full Blade Barringer 2015-01-10 09:33:52 -0600
  • 2b20c52a8d Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster Blade Barringer 2015-01-10 09:25:18 -0600
  • 0f3d6bc751 Explicitly reset mountCount to 0. (Otherwise, will not reset until refresh) Blade Barringer 2015-01-10 09:24:30 -0600
  • a5d6c9de3f Force update of mountCount after feedling Blade Barringer 2015-01-10 09:22:53 -0600
  • d5436dc8ec Corrected release mounts code Blade Barringer 2015-01-10 09:13:25 -0600