Commit Graph

1595 Commits

Author SHA1 Message Date
Verabird a3f0d4dea5 Add default values for shortdate and mediumdate formats 2014-12-26 15:48:19 -05:00
Matteo Pagliazzi 971ea8a495 chore(i18n): update locales 2014-12-26 11:33:21 +01:00
Sabe Jones 2cac24ebe9 chore(grunt): grunt full 2014-12-25 18:09:29 -06:00
Sabe Jones 37db763fc2 fix(event): Mystery sprite error 2014-12-25 18:08:14 -06:00
Sabe Jones 6c8f9e39b6 fix(event): Mystery typo 2014-12-25 18:05:04 -06:00
Sabe Jones 620fcd1144 Merge pull request #413 from SabreCat/seasonal
Winter Wonderland 2015 Cont'd
2014-12-25 17:48:12 -06:00
Sabe Jones 9d279b7a77 chore(grunt): grunt full 2014-12-25 17:43:31 -06:00
Alice Harris 5836436b7b Merge pull request #404 from Alys/develop
Style Guide for Equipment Descriptions
2014-12-26 08:26:20 +10:00
Sabe Jones 9471393776 feat(event): 2014 Mystery Items 2014-12-25 16:08:06 -06:00
Sabe Jones 41f4ab7b8a feat(event): Implement Seasonal Shop 2014-12-25 14:58:25 -06:00
Alice Harris 6fcf6b7d05 Merge pull request #412 from lacrimae/develop
Restored missing quote
2014-12-26 06:47:14 +10:00
lacrimae 93119d7eab ... and the quote I missed :P 2014-12-25 21:41:11 +01:00
lacrimae 772994c8a0 Restored missing quote 2014-12-25 21:40:24 +01:00
Blade Barringer aeceb70b54 Merge pull request #411 from lacrimae/develop
Corrected wording
2014-12-25 08:35:06 -06:00
lacrimae 17233ef5df Corrected wording
"may become grow more severe" -> "may grow more severe"
2014-12-25 15:21:29 +01:00
Matteo Pagliazzi a7b648102b Merge pull request #407 from HabitRPG/add-flag-to-chat
Add flag to chat
2014-12-23 18:35:55 +01:00
Alice Harris d34b116732 update formatting for gear style guidelines 2014-12-23 06:43:05 +10:00
Alice Harris d6354007f1 update formatting for gear style guidelines 2014-12-23 06:42:10 +10:00
Alice Harris 9d7bf26988 update formatting for gear style guidelines 2014-12-23 06:38:21 +10:00
Alice Harris 36a552b4a3 update formatting for gear style guidelines 2014-12-23 06:34:57 +10:00
Alice Harris e30ff2eebb create style guide for gear/equipment descriptions based on ShilohT's suggestions in https://github.com/HabitRPG/habitrpg-shared/pull/372 2014-12-23 06:28:34 +10:00
Blade Barringer 6f410f59ce Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into add-flag-to-chat 2014-12-22 13:28:01 -06:00
Matteo Pagliazzi d079ebbee9 chore(i18n): update locales 2014-12-22 20:09:45 +01:00
Sabe Jones be62f4bb7f Merge pull request #403 from SabreCat/Bailey
Promo art
2014-12-21 15:47:36 -06:00
Sabe Jones eb0d19fa29 chore(grunt): grunt full 2014-12-21 15:45:13 -06:00
Sabe Jones 0ec9e5b1e1 feat(news): Promo images 2014-12-21 15:40:07 -06:00
Sabe Jones ef02e059c7 chore(grunt): grunt full 2014-12-21 15:24:55 -06:00
Sabe Jones 649e207769 Merge pull request #402 from SabreCat/winter2015/hair
Wintery Hair Colors for Wonderland 2015
2014-12-21 15:16:10 -06:00
Sabe Jones 1ff25dfd5b Merge pull request #401 from SabreCat/winter2015/gear
Winter Wonderland 2015 Gear
2014-12-21 15:09:51 -06:00
Sabe Jones 784850f934 Merge pull request #400 from SabreCat/winter2015/npcs
Winter 2015 NPCs
2014-12-21 15:08:46 -06:00
Sabe Jones d0a97fb20f feat(event): Wintery Hair Colors
Also removes an accidental duplication of a prior hair resource.
2014-12-21 13:55:23 -06:00
Sabe Jones e62cb74ad0 fix(event): head, not helm 2014-12-21 12:43:44 -06:00
Sabe Jones 8ec9f79188 feat(event): Winter Wonderland 2015 gear 2014-12-21 12:37:37 -06:00
Sabe Jones 8d645bcafd chore(grunt): grunt full
Also flips Ian NPC to standard spritesmith instead of animated GIF.
2014-12-21 10:57:02 -06:00
Sabe Jones c8aadf296e feat(event): Winter NPCs 2014-12-21 10:44:08 -06:00
Blade Barringer eeff8a80d6 Brought in groups.json from original branch 2014-12-18 22:01:52 -06:00
Matteo Pagliazzi 486d8a9bbf chore(i18n): update locales 2014-12-18 22:56:34 +01:00
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