Commit Graph

1744 Commits

Author SHA1 Message Date
Blade Barringer 511b4a1b0b Added pet rocks 2015-01-18 20:34:12 -06:00
Blade Barringer 418f54a32d Added rock pet egg 2015-01-18 18:38:56 -06:00
Blade Barringer 0bb9aa9f56 Added rock quest boss 2015-01-18 18:30:54 -06:00
Blade Barringer 3bed7d8153 Added january mystery items 2015-01-18 18:25:25 -06:00
Blade Barringer c13f6b15a1 Added feb background images 2015-01-18 18:12:45 -06:00
Blade Barringer e7cb3f58e9 Merge branch 'issue4468' of https://github.com/scribblypanda/habitrpg-shared into scribblypanda-issue4468 2015-01-18 15:24:48 -06:00
Blade Barringer 6c9c2a5ec1 Merge pull request #445 from j-wilkins/patch-1
fix typo in README.md
2015-01-18 12:00:15 -06:00
Jake Wilkins d6a7fa0d2c s/migraring/migrating 2015-01-18 10:35:03 -07:00
Tyler Renelle 436e8b5622 Merge pull request #444 from HabitRPG/lefnire/one-module
Move to a single "habitrpg" module for services / directives / filters
2015-01-17 19:08:21 -07:00
Tyler Renelle 81bdb2481c refactor(services): move to a single "habitrpg" module for services /
directives / filters
2015-01-17 18:42:01 -07:00
Blade Barringer 2efadf7381 Removed white space on t-rex iamges closes #4531 2015-01-16 22:33:06 -06:00
Tyler Renelle 465bfe4df9 Merge pull request #443 from HabitRPG/lefnire/httpinterceptor
move httpInterceptor from app.js to habitrpg-shared/config.js
2015-01-16 18:32:52 -07:00
Tyler Renelle dbeb6f8c1e refactor(config): add mobile 2015-01-16 18:31:37 -07:00
Tyler Renelle 6b6802a27a refactor(config): move httpInterceptor from website/app.js to
habitrpg-shared/config.js. Will merge in mobile soon
2015-01-16 16:48:35 -07:00
Matteo Pagliazzi c301bd3e89 fix(console): remove console.log 2015-01-16 17:46:47 +01:00
Matteo Pagliazzi 73d684987e chore(grunt): compile 2015-01-16 17:33:44 +01:00
Matteo Pagliazzi 4a22b1dc57 fix(sync): fix for when data is null, ie. server offline 2015-01-16 17:33:15 +01:00
Matteo Pagliazzi 1f1cd750cb chore(i18n): update locales 2015-01-16 17:16:48 +01:00
Sabe Jones c1d1d7d4a5 chore(grunt): grunt full 2015-01-15 16:52:59 -06:00
Sabe Jones 3e17834b5d Merge pull request #440 from SabreCat/develop
T-Rex pet quest
2015-01-15 16:39:38 -06:00
Sabe Jones c260362d96 feat(quest): T-Rex pet
Implements two new Quests, and the "tyrannosaur" pets included as rewards for same.
2015-01-15 15:45:56 -06:00
Matteo Pagliazzi 8a2e9caca9 chore(i18n): update locales 2015-01-14 19:53:17 +01:00
Matteo Pagliazzi ce1c0d9008 Merge pull request #438 from crookedneighbor/prevent-type-changing
Prevent type changing
2015-01-14 19:41:44 +01:00
Blade Barringer 2bd1af587b Compiled coffeescript 2015-01-13 20:18:06 -06:00
Blade Barringer a805b4f0c9 Brought in lefnire's change so type cannot be changed on updateTask 2015-01-13 20:17:36 -06:00
Sabe Jones 4e50c43da2 fix(world-boss): Scale based on current HP 2015-01-13 13:19:38 -06:00
Sabe Jones 625d1dfbed Merge pull request #436 from SabreCat/stressbeast
Stressbeast healing on rage
2015-01-13 12:04:42 -06:00
Sabe Jones a2be1bc472 fix(world-boss): Bit stronger healing 2015-01-13 12:00:06 -06:00
Sabe Jones 480b4e2764 feat(world-boss): Healing on rage 2015-01-13 11:50:15 -06:00
scribblypanda 41364f6c59 modified login/display name info to be more descriptive 2015-01-12 21:45:58 -05:00
scribblypanda 45ae1ec7d6 changed display name description to be consistent with login name description 2015-01-11 20:31:52 -05:00
scribblypanda 6c99bbc948 added translatable strings for login name description 2015-01-11 20:29:36 -05:00
scribblypanda a505d88452 added translatable strings for display name description 2015-01-11 20:17:36 -05:00
scribblypanda ccb1c4cd99 split emailChange message into 3 parts 2015-01-11 13:18:39 -05:00
scribblypanda faf69fca8d added new translatable strings, mailto link 2015-01-11 10:37:16 -05:00
scribblypanda d9cb197d95 added new translatable string emailChange 2015-01-11 03:31:32 -05:00
scribblypanda 9aca62a53d added new translatable string emailChange 2015-01-11 03:21:53 -05:00
Alice Harris b0fc2a8e7c Merge pull request #434 from Alys/develop
change G to Gem to remove confusion with Gold
2015-01-11 11:06:48 +10:00
Alice Harris 4e2a79e69c change G to Gem to remove confusion with Gold 2015-01-11 10:58:47 +10:00
Sabe Jones fd7ba143cc Merge pull request #432 from SabreCat/stressbeast
World boss for Winter Wonderland 2015
2015-01-08 15:51:23 -06:00
Sabe Jones 8bd32e0f35 chore(grunt): grunt full 2015-01-08 15:29:41 -06:00
Sabe Jones fde64b0bdf feat(event): World Boss
Implements the 2015 Winter Wonderland world boss: the Abominable Stressbeast of Stoïkalm!
2015-01-08 15:24:26 -06:00
Matteo Pagliazzi 54a9df4619 test(cron): setup failing test for changing cds to an hour past last cron 2015-01-07 16:52:04 +01:00
Matteo Pagliazzi f4b72c088f chore(i18n): add danish and update locales 2015-01-06 15:59:20 +01:00
Matteo Pagliazzi d63cc4da8f merge cron-fix 2015-01-06 08:55:48 +01:00
deilann b5de2ebf4b Merge pull request #430 from scribblypanda/develop
off-hand to shield-hand in gear.json and questsContent.json
2015-01-05 20:50:47 -08:00
Tyler Renelle 9ab3849502 grunt 2015-01-05 21:33:14 -07:00
scribblypanda 2718fd39e3 off-hand to shield-hand in gear.json and questsContent.json 2015-01-05 23:27:04 -05:00
Sabe Jones 61b827183b fix(grunt): Push CSS 2015-01-05 17:15:05 -06:00
Sabe Jones 97a48eb66e chore(grunt): grunt full 2015-01-05 17:00:17 -06:00