e70fce24f5
Merge pull request #451 from SabreCat/scrolls
...
Differentiated quest scrolls and January 2015 subscriber item
2015-01-26 11:20:29 -06:00
65af7f362e
Merge branch 'scrolls' into develop
...
Conflicts:
views/shared/new-stuff.jade
2015-01-26 11:18:48 -06:00
ad08f1be9a
fix(news): Errant parenthesis
2015-01-26 11:11:04 -06:00
524761f1cf
feat(mystery): January subscriber set
2015-01-26 11:00:02 -06:00
e2f47651a4
feat(mystery): January subscriber set
2015-01-26 10:59:29 -06:00
6ca9c10cda
change some comments
2015-01-26 14:53:13 +10:00
5ced8800cd
Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
2015-01-25 21:01:18 -06:00
9b5b83871f
Refined triad Bingo calculation
2015-01-25 21:00:34 -06:00
94ebf0db46
Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
2015-01-25 20:42:25 -06:00
d9ecd41c1e
Fixed mountCount calculation
2015-01-25 20:26:51 -06:00
08ab6eba71
Converted shared to common in api test
2015-01-25 15:54:19 -06:00
23f1dd59c5
Converted shared to common for controllers
2015-01-25 15:26:37 -06:00
6472e04bd0
Changed shared to common for payments
2015-01-25 15:22:04 -06:00
af4f51857b
Changed models to use common instead of shared
2015-01-25 15:10:15 -06:00
c5c0125c49
Converted routes to use common instead of habitrpg-shared
2015-01-25 15:08:03 -06:00
1290581f39
Converted some files to use common instead of habitrpg-shared
2015-01-25 15:05:15 -06:00
001d5560b3
Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
2015-01-25 14:58:20 -06:00
731589c0ea
Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12
2015-01-25 08:39:37 +10:00
65a03ead50
Merge pull request #450 from Verabird/decreaseMP
...
Fix completed todos counting as checked dailies...
2015-01-25 08:34:26 +10:00
ff0906a5c0
Fix completed todos counting as checked dailies and change unless-else to if-else
2015-01-24 12:07:39 -05:00
009255bdb5
fix(sprite): Improved Nameless Helm
...
Fixes https://github.com/HabitRPG/habitrpg/issues/4568 .
2015-01-24 10:57:24 -06:00
baf092253d
Merge pull request #448 from Verabird/decreaseMP
...
Missed dailies decrease MP gained at cron
2015-01-24 17:29:58 +10:00
9ab86b536f
adjusted comments
2015-01-24 16:46:18 +10:00
a95522e165
create script to convert false to null in items.mounts for https://github.com/HabitRPG/habitrpg/pull/4374#issuecomment-71038795
2015-01-24 16:16:05 +10:00
dfb43af003
Merge branch 'common-convert' of github.com:HabitRPG/habitrpg into common-convert
2015-01-23 15:30:28 -06:00
4588be29ee
Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
2015-01-23 15:29:56 -06:00
72bc1cf40c
Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into develop
2015-01-23 15:29:36 -06:00
318dd506af
Added watts theme string
2015-01-23 15:29:00 -06:00
9f38ac86f7
Replaced blank death sound with actual sound files instead of blank
...
files
2015-01-23 15:27:57 -06:00
93c39e81bd
Added death sound. Put blank versions in daniel theme
2015-01-23 14:59:18 -06:00
de59c76609
Added watts themes to audio choices
2015-01-23 14:53:30 -06:00
e8f6091764
chore(i118n): update locales
2015-01-23 21:01:24 +01:00
412417505f
feat(quests): Differentiated scrolls
...
Implements logic to show specific scroll images per quest, falling back to the present scroll image if none is present. Also implements a "locked scroll" picture for unavailable quests in addition to the current background dimming.
2015-01-23 10:40:32 -06:00
2ca6636c94
feat(quests): Differentiated scrolls
...
Adds pixel art for individual quests so they can be differentiated in the Market.
2015-01-23 10:27:13 -06:00
ec114d6a3e
chore(news): Victory Bailey
...
Also includes a fix to disallow party quest bosses from using Rage healing to exceed initial Health.
2015-01-23 10:20:50 -06:00
042f2fbceb
Merge pull request #4498 from crookedneighbor/see-mp
...
See mp on stats page
2015-01-22 11:57:15 -06:00
1e35bcb6ed
Include checklist effect in cron MP gain and account for all gray dailies
2015-01-22 12:16:06 -05:00
37c7bd8df1
Removed shared form package and bower
2015-01-21 11:00:27 -06:00
db5082e0d7
Added shared dependencies to package.json
2015-01-21 10:41:08 -06:00
590eded44a
Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
...
Conflicts:
.gitignore
.travis.yml
2015-01-21 10:37:08 -06:00
c91b0cd34a
Moved folders into common directory
2015-01-21 10:34:04 -06:00
350997d7b2
Add initial try for having undone dailies decrease gained MP
2015-01-21 11:26:25 -05:00
9d7fc1efbb
chore(news): Stress Strike 3 Bailey
2015-01-21 10:17:19 -06:00
5c8450ba1a
Corrected triad bingo achievement for users that already had it
2015-01-20 19:26: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
5246257f62
Merge pull request #4550 from HabitRPG/bailey-20150120
...
Bailey 20150120 & Mount Master
2015-01-20 17:06:14 -06:00
76373ed816
Merge pull request #447 from HabitRPG/bailey-20150120
...
Bailey 20150120 & Mount Master
2015-01-20 17:06:02 -06:00
c73fb9eb31
Added in missing p tag
2015-01-20 16:44:49 -06:00
d4ab70b174
Removed errant comma
2015-01-20 16:41:36 -06:00
e95b238041
Gave credit to badge creators
2015-01-20 16:33:18 -06:00
Sabe Jones