10bc7e4eac
Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster
2015-01-16 10:44:52 -06:00
0b63e48c6e
feat(quest): T-Rex pet
...
Includes news announcements for 1/15/2014, Market implementation for T-Rex dual quest, and the ability for "healing" type Rage meters to work in party-scale boss fights.
2015-01-15 15:38:51 -06:00
1557907a1c
Updated string names
2015-01-12 13:12:40 -06:00
1c0520c94d
Removed link to picture of all pets, since it is now inaccurate and
...
there is no corresponding one for mounts
2015-01-10 09:38:03 -06:00
2b20c52a8d
Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster
2015-01-10 09:25:18 -06:00
dc37442691
Merge pull request #4478 from crookedneighbor/cmd-enter-for-chat
...
Cmd/Ctrl + enter for chat and pms.
2015-01-09 13:51:21 -06:00
ee339fba4a
feat(event): World boss
...
Implements the second HabitRPG world boss, the Abominable Stressbeast of Stoïkalm!
2015-01-08 15:22:42 -06:00
0807e7856c
Merge remote-tracking branch 'upstream/develop' into mountmaster
2015-01-08 11:31:45 -06:00
193b92c16b
fix(cds): max hour is 23 not 24
2015-01-06 23:12:03 +01:00
aa6b1e3f81
add remove-watch to markdown-directive
2015-01-05 22:19:05 +01:00
ad8add58d7
Merge pull request #4461 from negue/markdownText
...
change markdown ngModel to text attribute
2015-01-05 22:12:06 +01:00
f3676fcbf4
Added spaces between quantity and gem symbol
2015-01-05 13:33:43 -06:00
5deb72c457
Added ability to send chat via cmd/ctrl + enter
2015-01-05 13:17:23 -06:00
3c3bbcafb9
Simplified count in stable
2015-01-02 14:11:04 -06:00
1049e5e152
Key shows up when you have either 90 pets or 90 mounts. Opens lg modal
2015-01-02 13:08:45 -06:00
3a0de8f9c4
chore(January): news and deactivate cards
2015-01-01 23:20:59 -06:00
a45797a1ba
Adjusted text in view to show mountMaster progress
2015-01-01 17:06:34 -06:00
b3ccdc2859
change markdown ngModel to text attribute
2015-01-01 20:57:57 +01:00
d1355faa31
Merge pull request #4452 from SabreCat/nye
...
New Year's event features
2014-12-30 22:18:11 -06:00
edf66cbb59
feat(discount) google discount & use sub.key instead of sub.months
2014-12-30 20:05:07 -07:00
51acc477fe
feat(NYE): New Year's cards
2014-12-30 19:57:24 -06:00
303d30a270
Merge pull request #4439 from crookedneighbor/transparent-gems
...
Added transparent class to gem purchasing if zero gems are available for purchase
2014-12-30 11:11:32 -06:00
d8cfc1dd4b
WIP(NYE): New Year's cards
2014-12-29 20:58:28 -06:00
53fff0dbc6
feat(seasonal): Implement Snowball
...
Adds the snowball from Winter 2014 to the Seasonal Shop.
2014-12-29 19:40:11 -06:00
4eca27f19e
Corrected class name closes #4434
2014-12-29 19:15:51 -06:00
0ddbbc93a3
Merge branch 'develop' of https://github.com/melissamcewen/habitrpg into melissamcewen-develop
2014-12-29 18:33:14 -06:00
4a37bec652
fix(pr): indentation and simplify
2014-12-29 21:21:54 +01:00
752161b284
Merge branch 'dateformat' of git://github.com/Verabird/habitrpg into Verabird-dateformat
2014-12-29 21:09:04 +01:00
760381041f
Added transparent class to gem purchasing if zero gems are available for purchase
2014-12-29 11:18:01 -06:00
f8cdcd2e75
Inconsistent alignment of Gem prices in Seasonal Shop #4434
2014-12-28 23:35:47 -06:00
1a4455550d
Remove duplicate equipment-tab classes
2014-12-27 17:49:58 -08:00
a082e88b5d
Filter Array only once and one time binding - closes #4429
2014-12-27 23:26:30 +01:00
72d4bf2bf5
Merge pull request #4423 from andyzinsser/fix-no-food-text-color
...
Add muted class when no food is in inventory
2014-12-26 20:47:15 -06:00
db6f52e4b5
Add muted class when no food is in inventory
2014-12-26 18:31:21 -08:00
af7e68259d
Merge pull request #4404 from sbreiler/develop
...
Fix #4296 (Subscription "Update Card" message is cut off)
2014-12-27 12:29:04 +10:00
7297429888
Make it possible to choose between MM/dd and dd/MM date format
2014-12-26 15:52:42 -05:00
f5a0bd6903
Added trasnparent class to seasonal items already owned
2014-12-25 21:32:07 -06:00
1b4843ff58
fix(event): Better quest text placement
2014-12-25 17:42:09 -06:00
f4c582eb24
fix(event): quest syntax
2014-12-25 17:40:49 -06:00
597793e3ca
feat(event): Quests and Bailey
2014-12-25 17:36:16 -06:00
1c90886548
fix(event): Better shop flow
2014-12-25 15:52:26 -06:00
0e28f04c90
feat(event): Implement Seasonal Shop
2014-12-25 14:33:11 -06:00
e1eaefa943
Fix #4296 (Subscription "Update Card" message is cut off)
2014-12-24 00:14:08 +01:00
84db289957
Merge branch 'develop' into add-flag-to-chat
2014-12-23 10:07:42 -06:00
bb89a10356
feat(event): Wintery Hair Colors
2014-12-21 13:58:47 -06:00
1675bb26b2
change link in gala page to gala wiki
2014-12-19 07:47:28 -08:00
7f10049b37
Merge branch 'develop' of github.com:HabitRPG/habitrpg into add-flag-to-chat
...
Conflicts:
views/options/social/chat-message.jade
2014-12-18 21:55:50 -06:00
8ff0a4a4a4
fix(seasonal): Leslie link
2014-12-17 18:27:37 -06:00
eadedd5897
Merge pull request #4383 from SabreCat/seasonal
...
Seasonal Shop Basics
2014-12-16 21:51:02 -06:00
2822ce233f
fix(inn): see https://github.com/HabitRPG/habitrpg-shared/pull/231
2014-12-16 14:17:38 -07:00
Blade Barringer