Alice Harris
|
8401790017
|
Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12
Conflicts:
dist/habitrpg-shared.css
dist/habitrpg-shared.js
dist/spritesmith0.css
dist/spritesmith0.png
dist/spritesmith1.css
dist/spritesmith1.png
dist/spritesmith2.css
dist/spritesmith2.png
dist/spritesmith3.css
dist/spritesmith3.png
dist/spritesmith4.css
dist/spritesmith4.png
locales/cs/gear.json
locales/de/gear.json
locales/de/generic.json
locales/de/subscriber.json
locales/es/communityguidelines.json
locales/es/gear.json
locales/es/generic.json
locales/es_419/communityguidelines.json
locales/es_419/gear.json
locales/es_419/generic.json
locales/es_419/questscontent.json
locales/fr/gear.json
locales/fr/generic.json
locales/fr/limited.json
locales/hu/backgrounds.json
locales/hu/communityguidelines.json
locales/hu/content.json
locales/hu/front.json
locales/hu/gear.json
locales/hu/generic.json
locales/hu/groups.json
locales/hu/limited.json
locales/hu/messages.json
locales/hu/npc.json
locales/hu/pets.json
locales/hu/questscontent.json
locales/hu/subscriber.json
locales/hu/tasks.json
locales/it/gear.json
locales/it/generic.json
locales/it/groups.json
locales/it/limited.json
locales/it/subscriber.json
locales/nl/gear.json
locales/nl/limited.json
locales/nl/questscontent.json
locales/pl/gear.json
locales/pl/limited.json
locales/pl/subscriber.json
locales/pt/gear.json
locales/ro/gear.json
locales/ru/gear.json
locales/ru/limited.json
script/content.coffee
|
2015-01-18 15:46:25 +10: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 |
|
Alice Harris
|
9e9b5dbb20
|
Merge pull request #433 from Verabird/BuffSkillsAgain
Buffed some healer and warrior spells.
|
2015-01-11 12:04:10 +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 |
|
Alice Harris
|
4e2a79e69c
|
change G to Gem to remove confusion with Gold
|
2015-01-11 10:58:47 +10:00 |
|
Verabird
|
ebfab32c0f
|
doubled multiplier on CON buffs and changed multiplier on searing brightness from 1.5 to 4
|
2015-01-09 14:09:02 -05: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 |
|
Alice Harris
|
ab66f95c8e
|
Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12
Conflicts:
dist/habitrpg-shared.js
|
2015-01-06 15:26:59 +10: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 |
|
Sabe Jones
|
285ff6228c
|
fix(backgrounds): Frigid, not Snowy, Peak
|
2015-01-05 16:41:23 -06:00 |
|
Sabe Jones
|
0bfc5b37c0
|
feat(backgrounds): January backgrounds
|
2015-01-05 16:36:11 -06:00 |
|
negue
|
1bdacffe96
|
Merge pull request #428 from negue/markdownDirective
add remove-watch and use-timeout attribute to the markdown directive
|
2015-01-05 22:11:38 +01:00 |
|
Matteo Pagliazzi
|
5eda9a34b7
|
chore(grunt): compile
|
2015-01-05 19:20:22 +01:00 |
|
Brandon Reid
|
15eb64c7d2
|
Fixed cron dayStart option.
Wrote test cases to verify fix.
Fixed test cases that were incorrect.
|
2015-01-05 19:20:21 +01:00 |
|
Matteo Pagliazzi
|
a65c675243
|
chore(i18n): add hungarian and update locales
|
2015-01-05 17:31:26 +01:00 |
|
Blade Barringer
|
a54e1cd448
|
Compiled version of adjustment to spells
|
2015-01-04 16:15:36 -06:00 |
|
Blade Barringer
|
5d6da27a70
|
Merge branch 'issue4454habitrpg' of https://github.com/melissamcewen/habitrpg-shared into melissamcewen-issue4454habitrpg
|
2015-01-04 16:10:30 -06:00 |
|
Alice Harris
|
5ffb35485b
|
removed comments (outdated or inaccurate)
|
2015-01-04 15:38:30 +10:00 |
|
Tyler Renelle
|
8b4c6c450b
|
Revert "revert last commit"
This reverts commit 0cc87d4ea0.
|
2015-01-03 13:59:13 -07:00 |
|
Alice Harris
|
184cb69ce1
|
Merge pull request #426 from Verabird/AddDimRet
Add diminishing Returns to several skills
|
2015-01-03 13:07:44 +10:00 |
|
Alice Harris
|
04bc0a02b3
|
Merge remote-tracking branch 'upstream/rebalancing-2014-12' into rebalancing-2014-12
|
2015-01-03 13:01:17 +10:00 |
|