419b6bf611
Merge pull request #460 from negue/fullTranslation
...
add a locale var to all translations
2015-02-06 18:47:17 +01:00
ca70254751
feat(February): Backgrounds
2015-02-03 19:00:19 -06:00
c9b81414a4
feat(seasonal): Normal view
2015-02-02 18:53:54 -06:00
7e0d810463
fix(event): Robes not for your head
2015-01-31 08:58:23 -06:00
51b2b9bda1
fix(event): Party robes
...
The 2015 party robes were erroneously set up as event-duration gear, when they should have been added instead as conditional gear added only via database migration. Fixes https://github.com/HabitRPG/habitrpg/issues/4601 .
2015-01-31 08:48:00 -06:00
0e9be3217c
Fixed comment
2015-01-30 23:20:38 -06:00
7ab4cf5653
add comment about end dates for special events
2015-01-31 12:46:27 +10:00
5aecf8fd55
change end date for winter gear
2015-01-31 11:48:31 +10:00
b131d5b531
Merge pull request #458 from SabreCat/birthday
...
Habit Birthday 2015
2015-01-30 13:53:53 -06:00
e1983203c9
add a locale var to all translations
2015-01-30 20:11:29 +01:00
c8b9cf2873
feat(event): Habit Birthday 2015
2015-01-29 13:05:05 -06:00
e2cd4dca19
open external links
2015-01-29 17:40:27 +01:00
75eb6304eb
Renamed variable name
2015-01-28 13:51:03 -06:00
21be3e8957
Adjusted default tasks per lemoness
2015-01-28 13:43:15 -06:00
b890326545
Added new tasks for onboarding per lemoness
2015-01-27 21:50:41 -06:00
e2f47651a4
feat(mystery): January subscriber set
2015-01-26 10:59:29 -06:00
32ed4dace7
Fixed triad bingo achievement not being awarded to people who already
...
had it
2015-01-20 19:24:46 -06:00
76373ed816
Merge pull request #447 from HabitRPG/bailey-20150120
...
Bailey 20150120 & Mount Master
2015-01-20 17:06:02 -06:00
cb566a9679
Merge pull request #441 from negue/markdown
...
markdown timeoutTime attribute
2015-01-20 17:57:23 +01:00
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
7925935ff5
feat(world-boss): Desperation move
2015-01-19 21:47:27 -06:00
42e1020c60
Added back in showCompleted=false to display tags
2015-01-19 18:50:54 -06:00
da1a11b62d
Merge remote-tracking branch 'upstream/develop' into todos-dated-tab-2014-11-01
2015-01-19 17:53:48 +10:00
81bdb2481c
refactor(services): move to a single "habitrpg" module for services /
...
directives / filters
2015-01-17 18:42:01 -07:00
dbeb6f8c1e
refactor(config): add mobile
2015-01-16 18:31:37 -07:00
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
75971b0f40
Added triad bingo check to releaseBoth function
2015-01-16 17:01:01 -06:00
d9fed69147
Corrected releasBoth function to reset current pet and deduct the
...
correct amount of gems
2015-01-16 16:52:59 -06:00
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
c301bd3e89
fix(console): remove console.log
2015-01-16 17:46:47 +01:00
4a22b1dc57
fix(sync): fix for when data is null, ie. server offline
2015-01-16 17:33:15 +01:00
1f1cd750cb
chore(i18n): update locales
2015-01-16 17:16:48 +01:00
5c28730dc1
markdown timeoutTime attribute
2015-01-15 22:53:47 +01:00
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
ce1c0d9008
Merge pull request #438 from crookedneighbor/prevent-type-changing
...
Prevent type changing
2015-01-14 19:41:44 +01:00
a805b4f0c9
Brought in lefnire's change so type cannot be changed on updateTask
2015-01-13 20:17:36 -06:00
4e50c43da2
fix(world-boss): Scale based on current HP
2015-01-13 13:19:38 -06:00
a2be1bc472
fix(world-boss): Bit stronger healing
2015-01-13 12:00:06 -06:00
480b4e2764
feat(world-boss): Healing on rage
2015-01-13 11:50:15 -06:00
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
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
d5436dc8ec
Corrected release mounts code
2015-01-10 09:13:25 -06:00
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
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
d63cc4da8f
merge cron-fix
2015-01-06 08:55:48 +01:00
285ff6228c
fix(backgrounds): Frigid, not Snowy, Peak
2015-01-05 16:41:23 -06:00
0bfc5b37c0
feat(backgrounds): January backgrounds
2015-01-05 16:36:11 -06:00
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
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
5d6da27a70
Merge branch 'issue4454habitrpg' of https://github.com/melissamcewen/habitrpg-shared into melissamcewen-issue4454habitrpg
2015-01-04 16:10:30 -06:00
Matteo Pagliazzi