Commit graph

638 commits

Author SHA1 Message Date
Blade Barringer
36a72e3da8 Updated tavern message per lemoness 2015-01-29 12:30:18 -06:00
Blade Barringer
e2b9e03d8a Added reminder about swearing in the tavern 2015-01-29 12:21:54 -06:00
Matteo Pagliazzi
70ff1a8fee chore(i18n): update locales 2015-01-29 19:09:29 +01:00
Blade Barringer
c9294897f7 Merge pull request #456 from Sporax/develop
Changed capitalization of 'dailies', 'daily', and 'habit(s)'
2015-01-29 10:06:55 -06:00
Saagar Saini
c69e3195df updated capitalization of habit(s), daily, dailies 2015-01-29 16:47:39 +05:30
Blade Barringer
6def48e77e Merge pull request #455 from crookedneighbor/new-tasks-for-onboarding
New tasks for onboarding
2015-01-28 13:52:12 -06:00
Blade Barringer
75eb6304eb Renamed variable name 2015-01-28 13:51:03 -06:00
Blade Barringer
520df87362 fixed default todo note 2015-01-28 13:50:11 -06:00
Blade Barringer
21be3e8957 Adjusted default tasks per lemoness 2015-01-28 13:43:15 -06:00
Matteo Pagliazzi
dca6880d13 chore(i18n): update locales 2015-01-28 17:30:54 +01:00
Saagar Saini
cd19ef9607 changed capitalization of 'dailies', 'daily', and 'habit(s)' 2015-01-28 20:08:09 +05:30
Blade Barringer
7ef0c70b8b Added placeholder blank notes 2015-01-27 21:52:54 -06:00
Blade Barringer
b890326545 Added new tasks for onboarding per lemoness 2015-01-27 21:50:41 -06:00
Blade Barringer
e19cf6b37f Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into develop 2015-01-27 20:46:18 -06:00
Blade Barringer
70d3901000 New strings for quest modal 2015-01-27 20:46:01 -06:00
Matteo Pagliazzi
5ba1e96b3c chore(i18n): update locales 2015-01-27 20:36:03 +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
Blade Barringer
0c40b43013 Added rebirth notice for seasonal shop 2015-01-26 22:15:05 -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
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
e2f47651a4 feat(mystery): January subscriber set 2015-01-26 10:59:29 -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
Matteo Pagliazzi
e8f6091764 chore(i118n): update locales 2015-01-23 21:01:24 +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
Alice Harris
da1a11b62d Merge remote-tracking branch 'upstream/develop' into todos-dated-tab-2014-11-01 2015-01-19 17:53:48 +10:00
Blade Barringer
62d7505233 Merge pull request #423 from crookedneighbor/vIiRuS-groupSorting
Additional options for group sorting in header
2015-01-18 23:08:34 -06:00
Alice Harris
9b9b70b7d4 change "level" to "tier"; remove incorrect number of gems 2015-01-19 11:24:42 +10:00
Blade Barringer
69c9c12969 Updated keys to kennel info for triad bingo 2015-01-18 19:10:50 -06:00
Blade Barringer
e7cb3f58e9 Merge branch 'issue4468' of https://github.com/scribblypanda/habitrpg-shared into scribblypanda-issue4468 2015-01-18 15:24:48 -06:00
Blade Barringer
3625cf514e Added triad bingo achievement test 2015-01-16 11:49:00 -06:00
Blade Barringer
e565bf7896 Added initial strings for triad bingo 2015-01-16 11:25:49 -06:00
Blade Barringer
e8b6779be6 Merge branch 'mountmaster' of github.com:HabitRPG/habitrpg-shared into mountmaster 2015-01-16 10:47:50 -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
1f1cd750cb chore(i18n): update locales 2015-01-16 17:16:48 +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
8a2e9caca9 chore(i18n): update locales 2015-01-14 19:53:17 +01:00
Taldin
150909cc95 Rewritten modal
As per comments in #4374.
2015-01-13 11:31:02 -08:00
Sabe Jones
480b4e2764 feat(world-boss): Healing on rage 2015-01-13 11:50:15 -06:00
Blade Barringer
ddff5afda7 Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into mountmaster
Conflicts:
	dist/habitrpg-shared.js
2015-01-12 21:50:57 -06:00
scribblypanda
41364f6c59 modified login/display name info to be more descriptive 2015-01-12 21:45:58 -05:00
Blade Barringer
f1e354ba0e Added string for both beast master and mount master 2015-01-12 13:12:50 -06:00
Blade Barringer
1fd068ae89 Corrected capitalization 2015-01-12 13:09:51 -06:00
Blade Barringer
c7d8c40b0b Updated strings to use master instead of abreviated mast 2015-01-12 12:58:55 -06:00
scribblypanda
45ae1ec7d6 changed display name description to be consistent with login name description 2015-01-11 20:31:52 -05:00
scribblypanda
6c99bbc948 added translatable strings for login name description 2015-01-11 20:29:36 -05:00
scribblypanda
a505d88452 added translatable strings for display name description 2015-01-11 20:17:36 -05:00
Blade Barringer
b4a62d76b7 Corrected beastmaster to beast master 2015-01-11 18:28:50 -06:00