Blade Barringer
1fe3664731
ran grunt to compile coffeescript
2014-12-18 14:01:31 -06:00
Ben Lind
e1d44cc54f
HabitRPG/habitrpg#3260 Buttonless habit full width
...
When the user has neither a plus nor a minus button on
one of their habits, the habit’s title will now span the entire
width of the task div instead of having a gap to the left.
2014-12-18 14:01:31 -06:00
Alice Harris
4f5e813fcf
Merge pull request #396 from jamesleonis/develop
...
Incorrect grammar in Vice 2 quest notes
2014-12-18 19:48:46 +10:00
James Leonis
c308f6cf9f
Incorrect grammar in Vice 2 quest notes
...
"makes it's way to Mt. Habitica" to "makes its way to Mt. Habitica"
2014-12-18 01:01:18 -08:00
Tyler Renelle
30e5e2096a
grunt full
2014-12-17 21:53:27 -07:00
Sabe Jones
09ba5384f8
Merge pull request #395 from SabreCat/seasonal
...
fix(seasonal): Leslie link
2014-12-17 18:38:32 -06:00
Sabe Jones
6e77392e7a
fix(seasonal): Leslie link
2014-12-17 18:26:52 -06:00
Sabe Jones
cbfd043b2c
Merge pull request #394 from SabreCat/seasonal
...
Seasonal Shop Basics
2014-12-16 21:52:28 -06:00
Tyler Renelle
059f719461
Merge pull request #231 from wc8/patch-1
...
innText update of groups.json to call username
2014-12-16 14:16:26 -07:00
Sabe Jones
19930226c7
chore(grunt): grunt
2014-12-14 14:24:37 -06:00
Sabe Jones
c7ee171ee4
feat(seasonal): Seasonal shop
...
Initial commit of resources for the Seasonal Shop feature.
2014-12-14 13:33:10 -06:00
Blade Barringer
0352adfd47
Merge pull request #393 from SabreCat/timetravel
...
Translate Time Travelers
2014-12-14 13:27:48 -06:00
Sabe Jones
8d042745be
fix(I18N): Translate Time Travelers
2014-12-14 12:57:36 -06:00
Blade Barringer
fd3cbf481d
Merge pull request #390 from lacrimae/develop
...
Streamlined "Confers no benefit" placements
2014-12-14 11:02:45 -06:00
lacrimae
ff8a508860
Streamlined "Confers no benefit" placements
2014-12-14 13:32:44 +01:00
Alice Harris
5368d3b760
Merge pull request #389 from lacrimae/develop
...
Pull req: Clarifying spell effects on attributes
2014-12-13 10:31:50 +10:00
lacrimae
118a5432e5
Merge branch 'develop' of https://github.com/lacrimae/habitrpg-shared into develop
2014-12-13 00:16:24 +01:00
lacrimae
a15c57c275
Accidentally a dash
2014-12-13 00:15:46 +01:00
lacrimae
63263bbf3a
Spells now mention which attribute they affect
...
https://github.com/HabitRPG/habitrpg-shared/issues/380
2014-12-13 00:15:46 +01:00
Blade Barringer
d2e5f60dd4
Added inbox as a env.t var
2014-12-10 10:46:36 -06:00
Sabe Jones
842289ffdf
Merge pull request #384 from SabreCat/penguin
...
Penguin quest
2014-12-09 21:23:19 -06:00
Sabe Jones
ac2ce59873
chore(grunt): grunt
2014-12-09 21:16:00 -06:00
Sabe Jones
c6d3d72e00
fix(sprites): Move penguins 3px
2014-12-09 21:08:13 -06:00
Sabe Jones
5cd6c02e8a
fix(quest): Dapper to perspicacious
2014-12-09 20:56:38 -06:00
Sabe Jones
7fd4cebbdc
fix(quest): Penguin corrections
...
Fix missing egg item and line breaks in quest text
2014-12-09 20:44:10 -06:00
Sabe Jones
d25455fa5a
feat(quest): Implement Penguin pet quest
2014-12-09 20:21:20 -06:00
Paul Klipp
3d2c7e8854
Fixed a grammar error in the Golden Knight 2 quest
...
Changed “Perhaps I will shall . . . “ to “Perhaps I will . . . “
2014-12-08 12:19:08 -06:00
lacrimae
9a60fc7ca8
Accidentally a dash
2014-12-08 01:02:14 +01:00
lacrimae
d27dc29607
Spells now mention which attribute they affect
...
https://github.com/HabitRPG/habitrpg-shared/issues/380
2014-12-08 01:01:06 +01:00
Blade Barringer
6739ec25a3
Merge pull request #379 from andymantell/feature/linking-timetravellers-names
...
Link for Tyler and Vicky's names
2014-12-06 16:48:00 -06:00
Tyler Renelle
3de86f35cb
fix(plans): attempted fix for: Cast to number failed for value "NaN" at
...
path "purchased.plan.consecutive.count", see https://github.com/HabitRPG/habitrpg/issues/4317
2014-12-06 12:49:19 -07:00
Matteo Pagliazzi
17f9d4de72
fix(i18n): fix english string
2014-12-06 19:18:28 +01:00
Andy Mantell
82cea43e07
Link for Tyler and Vicky's names
2014-12-06 15:42:32 +00:00
Blade Barringer
b23a76f8c8
Merge pull request #365 from crookedneighbor/fix-moment-deprication-warnings-on-tests
...
Corrected ordering of arguments for moment().add and moment().subtract
2014-12-06 00:56:16 -06:00
Tyler Renelle
2018cc84ab
fix(gem-cap) use customerId in gem purchase
2014-12-05 15:11:27 -07:00
Matteo Pagliazzi
f010bd7ad9
chore(i18n): update locales
2014-12-05 16:21:13 +01:00
Matteo Pagliazzi
09aeaf2812
Merge branch 'crookedneighbor-translate-mystic-items' into develop
2014-12-05 16:06:51 +01:00
Matteo Pagliazzi
198d41d5e8
fix(pr): conflicts
2014-12-05 16:06:15 +01:00
Sabe Jones
4aacc103db
Merge pull request #377 from SabreCat/gems
...
Prettify Market Gem
2014-12-04 20:31:45 -06:00
Sabe Jones
a0434e67a6
Revert "fix(style): Pet key margins like sub gems"
...
This reverts commit d584e998ba .
2014-12-04 20:26:27 -06:00
Sabe Jones
d584e998ba
fix(style): Pet key margins like sub gems
2014-12-04 20:14:16 -06:00
Blade Barringer
6dac81f850
Corrected strings so they only used on variable
2014-12-04 20:03:17 -06:00
Sabe Jones
6369934ca3
feat(Gems): Add strings for Market gem
2014-12-04 19:04:07 -06:00
Blade Barringer
a55fa37412
Converted strings to be able to use links
2014-12-03 22:46:41 -06:00
Blade Barringer
2e2faa6117
Moved pre-subscription time travelers title and popover to shared
2014-12-03 22:24:43 -06:00
Blade Barringer
87092e8109
Added mystic hourglass and time travelers screens
2014-12-03 22:19:33 -06:00
Sabe Jones
cc32369497
fix(style): Prettify Market Gem
2014-12-03 22:10:35 -06:00
Tyler Renelle
6ac6f4d476
fix(plans): fix conversion cap
2014-12-03 20:24:35 -07:00
Tyler Renelle
9e64bc3788
fix(plans): move plan reset up for people in inn
2014-12-03 20:16:33 -07:00
Tyler Renelle
9d3e6c71fe
fix(plans): possible safe-check of gemcapextra cc @Sabrecat
2014-12-03 20:03:40 -07:00