 Sabe Jones
|
6a6a4e5924
|
Merge pull request #446 from SabreCat/stressbeast
World boss desperation move
|
2015-01-19 23:17:26 -06:00 |
|
|
Sabe Jones
|
7925935ff5
|
feat(world-boss): Desperation move
|
2015-01-19 21:47:27 -06:00 |
|
|
Blade Barringer
|
42e1020c60
|
Added back in showCompleted=false to display tags
|
2015-01-19 18:50:54 -06:00 |
|
|
Tyler Renelle
|
899de5fc25
|
grunt
|
2015-01-19 16:14:21 -07:00 |
|
|
Alice Harris
|
64cd6eac25
|
Merge pull request #350 from Alys/todos-dated-tab-2014-11-01
create a "Dated" To-Dos tab
|
2015-01-19 18:16:17 +10:00 |
|
|
Alice Harris
|
da1a11b62d
|
Merge remote-tracking branch 'upstream/develop' into todos-dated-tab-2014-11-01
|
2015-01-19 17:53:48 +10:00 |
|
|
Blade Barringer
|
62d7505233
|
Merge pull request #423 from crookedneighbor/vIiRuS-groupSorting
Additional options for group sorting in header
|
2015-01-18 23:08:34 -06:00 |
|
|
Blade Barringer
|
6a7d84b842
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into develop
|
2015-01-18 21:24:28 -06:00 |
|
|
Blade Barringer
|
8b864e114b
|
Compiled spritesheets
|
2015-01-18 21:11:49 -06:00 |
|
|
Blade Barringer
|
86c7203170
|
Added rock mounts
|
2015-01-18 21:11:41 -06:00 |
|
|
Blade Barringer
|
511b4a1b0b
|
Added pet rocks
|
2015-01-18 20:34:12 -06:00 |
|
|
Alice Harris
|
9b9b70b7d4
|
change "level" to "tier"; remove incorrect number of gems
|
2015-01-19 11:24:42 +10: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
|
27dab4ae4e
|
Merge remote-tracking branch 'upstream/develop' into todos-dated-tab-2014-11-01
Conflicts:
dist/habitrpg-shared.js
|
2015-01-11 14:18:37 +10: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 |
|