Blade Barringer
58650baba3
Merge branch 'issue#4556' of https://github.com/matttelliott/habitrpg into border
2015-01-27 09:10:46 -06:00
Matteo Pagliazzi
42c0b443d7
fix(i18n): language selection working on static pages
2015-01-27 15:48:57 +01:00
Alice Harris
68573b1f31
Merge pull request #453 from Sporax/develop
...
changed description for A stern talking-to from - habit to negative Habit - fixes https://github.com/HabitRPG/habitrpg/issues/4570
2015-01-27 19:05:48 +10:00
Matt T Elliott
2c40097403
move from left div to right
2015-01-26 23:14:19 -08:00
Matt T Elliott
3a38bb849b
add .border-left
2015-01-26 23:08:15 -08:00
Blade Barringer
b9784fa4aa
Added notice for rebirth in seasonal shop
2015-01-26 22:15:24 -06:00
Blade Barringer
0c40b43013
Added rebirth notice for seasonal shop
2015-01-26 22:15:05 -06:00
Blade Barringer
07870e1c7c
Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
2015-01-26 19:36:38 -06:00
Blade Barringer
7eae5db256
Added comment describing the silly conditional for transparency in the
...
seasonal shop
2015-01-26 19:25:53 -06:00
Blade Barringer
3b1743dee8
Corrected ng-class condition to show transparent class
...
on seasonal shop items after rebirth
2015-01-26 18:55:10 -06:00
Saagar Saini
c83a91886d
Update questsContent.json
2015-01-27 03:34:15 +05:30
Saagar Saini
b469419c70
changed description for A stern talking-to from - habit to negative Habit
2015-01-27 03:03:43 +05:30
Blade Barringer
eceaaef954
Merge pull request #4567 from crookedneighbor/add-audio-watts
...
Added Watts' Theme to Audio Choices
2015-01-26 11:27:27 -06:00
Sabe Jones
9389899ed2
chore(grunt): grunt full
2015-01-26 11:23:40 -06:00
Sabe Jones
e70fce24f5
Merge pull request #451 from SabreCat/scrolls
...
Differentiated quest scrolls and January 2015 subscriber item
2015-01-26 11:20:29 -06:00
Sabe Jones
65af7f362e
Merge branch 'scrolls' into develop
...
Conflicts:
views/shared/new-stuff.jade
2015-01-26 11:18:48 -06:00
Sabe Jones
ad08f1be9a
fix(news): Errant parenthesis
2015-01-26 11:11:04 -06:00
Sabe Jones
524761f1cf
feat(mystery): January subscriber set
2015-01-26 11:00:02 -06:00
Sabe Jones
e2f47651a4
feat(mystery): January subscriber set
2015-01-26 10:59:29 -06:00
Blade Barringer
5ced8800cd
Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
2015-01-25 21:01:18 -06:00
Blade Barringer
9b5b83871f
Refined triad Bingo calculation
2015-01-25 21:00:34 -06:00
Blade Barringer
94ebf0db46
Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
2015-01-25 20:42:25 -06:00
Blade Barringer
d9ecd41c1e
Fixed mountCount calculation
2015-01-25 20:26:51 -06:00
Blade Barringer
08ab6eba71
Converted shared to common in api test
2015-01-25 15:54:19 -06:00
Blade Barringer
23f1dd59c5
Converted shared to common for controllers
2015-01-25 15:26:37 -06:00
Blade Barringer
6472e04bd0
Changed shared to common for payments
2015-01-25 15:22:04 -06:00
Blade Barringer
af4f51857b
Changed models to use common instead of shared
2015-01-25 15:10:15 -06:00
Blade Barringer
c5c0125c49
Converted routes to use common instead of habitrpg-shared
2015-01-25 15:08:03 -06:00
Blade Barringer
1290581f39
Converted some files to use common instead of habitrpg-shared
2015-01-25 15:05:15 -06:00
Blade Barringer
001d5560b3
Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
2015-01-25 14:58:20 -06:00
Sabe Jones
009255bdb5
fix(sprite): Improved Nameless Helm
...
Fixes https://github.com/HabitRPG/habitrpg/issues/4568 .
2015-01-24 10:57:24 -06:00
Alice Harris
9ab86b536f
adjusted comments
2015-01-24 16:46:18 +10:00
Alice Harris
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
Blade Barringer
dfb43af003
Merge branch 'common-convert' of github.com:HabitRPG/habitrpg into common-convert
2015-01-23 15:30:28 -06:00
Blade Barringer
4588be29ee
Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
2015-01-23 15:29:56 -06:00
Blade Barringer
72bc1cf40c
Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into develop
2015-01-23 15:29:36 -06:00
Blade Barringer
318dd506af
Added watts theme string
2015-01-23 15:29:00 -06:00
Blade Barringer
9f38ac86f7
Replaced blank death sound with actual sound files instead of blank
...
files
2015-01-23 15:27:57 -06:00
Blade Barringer
93c39e81bd
Added death sound. Put blank versions in daniel theme
2015-01-23 14:59:18 -06:00
Blade Barringer
de59c76609
Added watts themes to audio choices
2015-01-23 14:53:30 -06:00
Matteo Pagliazzi
e8f6091764
chore(i118n): update locales
2015-01-23 21:01:24 +01:00
Sabe Jones
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
Sabe Jones
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
Sabe Jones
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
Blade Barringer
042f2fbceb
Merge pull request #4498 from crookedneighbor/see-mp
...
See mp on stats page
2015-01-22 11:57:15 -06:00
Blade Barringer
37c7bd8df1
Removed shared form package and bower
2015-01-21 11:00:27 -06:00
Blade Barringer
db5082e0d7
Added shared dependencies to package.json
2015-01-21 10:41:08 -06:00
Blade Barringer
590eded44a
Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
...
Conflicts:
.gitignore
.travis.yml
2015-01-21 10:37:08 -06:00
Blade Barringer
c91b0cd34a
Moved folders into common directory
2015-01-21 10:34:04 -06:00
Sabe Jones
9d7fc1efbb
chore(news): Stress Strike 3 Bailey
2015-01-21 10:17:19 -06:00
