 Alice Harris
|
6ca9c10cda
|
change some comments
|
2015-01-26 14:53:13 +10:00 |
|
|
Alice Harris
|
731589c0ea
|
Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12
|
2015-01-25 08:39:37 +10:00 |
|
|
Verabird
|
ff0906a5c0
|
Fix completed todos counting as checked dailies and change unless-else to if-else
|
2015-01-24 12:07:39 -05:00 |
|
|
Verabird
|
1e35bcb6ed
|
Include checklist effect in cron MP gain and account for all gray dailies
|
2015-01-22 12:16:06 -05:00 |
|
|
Verabird
|
350997d7b2
|
Add initial try for having undone dailies decrease gained MP
|
2015-01-21 11:26:25 -05:00 |
|
|
Blade Barringer
|
32ed4dace7
|
Fixed triad bingo achievement not being awarded to people who already
had it
|
2015-01-20 19:24:46 -06:00 |
|
|
Blade Barringer
|
76373ed816
|
Merge pull request #447 from HabitRPG/bailey-20150120
Bailey 20150120 & Mount Master
|
2015-01-20 17:06:02 -06:00 |
|
|
negue
|
cb566a9679
|
Merge pull request #441 from negue/markdown
markdown timeoutTime attribute
|
2015-01-20 17:57:23 +01:00 |
|
|
Blade Barringer
|
cc6cb3785e
|
Merge branch 'mountmaster' into bailey-20150120
Conflicts:
dist/habitrpg-shared.css
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
|
2015-01-20 10:39:45 -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 |
|
|
Alice Harris
|
c7ccc5c21d
|
Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12
Conflicts:
dist/spritesmith0.png
dist/spritesmith1.png
dist/spritesmith2.png
dist/spritesmith3.png
dist/spritesmith4.png
|
2015-01-20 06:01:09 +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 |
|
|
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
|
81bdb2481c
|
refactor(services): move to a single "habitrpg" module for services /
directives / filters
|
2015-01-17 18:42:01 -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 |
|
|
Blade Barringer
|
75971b0f40
|
Added triad bingo check to releaseBoth function
|
2015-01-16 17:01:01 -06:00 |
|
|
Blade Barringer
|
d9fed69147
|
Corrected releasBoth function to reset current pet and deduct the
correct amount of gems
|
2015-01-16 16:52:59 -06:00 |
|
|
Blade Barringer
|
75cf2a4788
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into mountmaster
Conflicts:
dist/habitrpg-shared.css
dist/habitrpg-shared.js
dist/spritesmith0.css
dist/spritesmith0.png
|
2015-01-16 10:46:59 -06:00 |
|
|
Matteo Pagliazzi
|
c301bd3e89
|
fix(console): remove console.log
|
2015-01-16 17:46:47 +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 |
|
|
Negue
|
5c28730dc1
|
markdown timeoutTime attribute
|
2015-01-15 22:53:47 +01: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
|
ce1c0d9008
|
Merge pull request #438 from crookedneighbor/prevent-type-changing
Prevent type changing
|
2015-01-14 19:41:44 +01: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
|
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
|
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 |
|
|
Blade Barringer
|
83d91dfe34
|
Merged in changes from develop and re-ran grunt full
Conflicts:
dist/habitrpg-shared.css
dist/habitrpg-shared.js
dist/spritesmith0.css
dist/spritesmith0.png
dist/spritesmith1.png
dist/spritesmith2.css
dist/spritesmith2.png
dist/spritesmith3.css
dist/spritesmith3.png
dist/spritesmith4.css
dist/spritesmith4.png
dist/spritesmith5.css
dist/spritesmith5.png
|
2015-01-10 09:33:52 -06:00 |
|
|
Blade Barringer
|
d5436dc8ec
|
Corrected release mounts code
|
2015-01-10 09:13:25 -06: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
|
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 |
|
|
Blade Barringer
|
8f90d154a0
|
Merge remote-tracking branch 'upstream/develop' into mountmaster
Conflicts:
dist/habitrpg-shared.css
dist/spritesmith0.css
dist/spritesmith0.png
dist/spritesmith1.css
dist/spritesmith1.png
dist/spritesmith2.css
dist/spritesmith2.png
dist/spritesmith3.css
dist/spritesmith3.png
|
2015-01-08 11:30:53 -06: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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
Alice Harris
|
ac08549f84
|
Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12
Conflicts:
dist/habitrpg-shared.js
|
2015-01-03 13:01:01 +10:00 |
|
|
Blade Barringer
|
0053dd67bd
|
Adjusted translation key text, added a new one for releasing both. Added
releaseBoth function
|
2015-01-02 13:20:58 -06:00 |
|
|
Blade Barringer
|
312aa11272
|
Refactored release scripts
|
2015-01-02 12:41:36 -06:00 |
|
|
Blade Barringer
|
3389d418ce
|
Set up system to calculate if Mountmaster should be awarded
|
2015-01-01 16:51:58 -06:00 |
|