195f7832d0
Change valorousPresence to utilize diminishing returns. Keep results at 200 str the same
2014-12-29 13:57:11 -05:00
058e506d13
Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12
2014-12-27 07:05:52 +10:00
971ea8a495
chore(i18n): update locales
2014-12-26 11:33:21 +01:00
2cac24ebe9
chore(grunt): grunt full
2014-12-25 18:09:29 -06:00
37db763fc2
fix(event): Mystery sprite error
2014-12-25 18:08:14 -06:00
6c8f9e39b6
fix(event): Mystery typo
2014-12-25 18:05:04 -06:00
620fcd1144
Merge pull request #413 from SabreCat/seasonal
...
Winter Wonderland 2015 Cont'd
2014-12-25 17:48:12 -06:00
9d279b7a77
chore(grunt): grunt full
2014-12-25 17:43:31 -06:00
5836436b7b
Merge pull request #404 from Alys/develop
...
Style Guide for Equipment Descriptions
2014-12-26 08:26:20 +10:00
9471393776
feat(event): 2014 Mystery Items
2014-12-25 16:08:06 -06:00
41f4ab7b8a
feat(event): Implement Seasonal Shop
2014-12-25 14:58:25 -06:00
6fcf6b7d05
Merge pull request #412 from lacrimae/develop
...
Restored missing quote
2014-12-26 06:47:14 +10:00
93119d7eab
... and the quote I missed :P
2014-12-25 21:41:11 +01:00
772994c8a0
Restored missing quote
2014-12-25 21:40:24 +01:00
aeceb70b54
Merge pull request #411 from lacrimae/develop
...
Corrected wording
2014-12-25 08:35:06 -06:00
17233ef5df
Corrected wording
...
"may become grow more severe" -> "may grow more severe"
2014-12-25 15:21:29 +01:00
a7b648102b
Merge pull request #407 from HabitRPG/add-flag-to-chat
...
Add flag to chat
2014-12-23 18:35:55 +01:00
d34b116732
update formatting for gear style guidelines
2014-12-23 06:43:05 +10:00
d6354007f1
update formatting for gear style guidelines
2014-12-23 06:42:10 +10:00
9d7bf26988
update formatting for gear style guidelines
2014-12-23 06:38:21 +10:00
36a552b4a3
update formatting for gear style guidelines
2014-12-23 06:34:57 +10:00
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
6f410f59ce
Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into add-flag-to-chat
2014-12-22 13:28:01 -06:00
d079ebbee9
chore(i18n): update locales
2014-12-22 20:09:45 +01:00
be62f4bb7f
Merge pull request #403 from SabreCat/Bailey
...
Promo art
2014-12-21 15:47:36 -06:00
eb0d19fa29
chore(grunt): grunt full
2014-12-21 15:45:13 -06:00
0ec9e5b1e1
feat(news): Promo images
2014-12-21 15:40:07 -06:00
ef02e059c7
chore(grunt): grunt full
2014-12-21 15:24:55 -06:00
649e207769
Merge pull request #402 from SabreCat/winter2015/hair
...
Wintery Hair Colors for Wonderland 2015
2014-12-21 15:16:10 -06:00
1ff25dfd5b
Merge pull request #401 from SabreCat/winter2015/gear
...
Winter Wonderland 2015 Gear
2014-12-21 15:09:51 -06:00
784850f934
Merge pull request #400 from SabreCat/winter2015/npcs
...
Winter 2015 NPCs
2014-12-21 15:08:46 -06:00
d0a97fb20f
feat(event): Wintery Hair Colors
...
Also removes an accidental duplication of a prior hair resource.
2014-12-21 13:55:23 -06:00
e62cb74ad0
fix(event): head, not helm
2014-12-21 12:43:44 -06:00
8ec9f79188
feat(event): Winter Wonderland 2015 gear
2014-12-21 12:37:37 -06:00
8d645bcafd
chore(grunt): grunt full
...
Also flips Ian NPC to standard spritesmith instead of animated GIF.
2014-12-21 10:57:02 -06:00
c8aadf296e
feat(event): Winter NPCs
2014-12-21 10:44:08 -06:00
4a7dcfc2bb
merge changes for smash (Brutal Smash) from brandonjreid's PR https://github.com/HabitRPG/habitrpg-shared/pull/331
2014-12-20 21:13:43 +10:00
e9c8f66562
merge backStab change by brandonjreid from https://github.com/HabitRPG/habitrpg-shared/pull/331
2014-12-20 16:03:37 +10:00
fbc5a258f6
stop backStab and fireball (Burst of Flames) changing the task value
2014-12-20 13:35:10 +10:00
44a7448a96
compiled dist/habitrpg-shared.js
2014-12-20 11:18:13 +10:00
9f77819d94
add pickpocket change from PR by brandonjreid: https://github.com/HabitRPG/habitrpg-shared/pull/331/files#diff-652dbbf3d459e90a3de1a122c063bb6bL502
2014-12-20 11:07:47 +10:00
afef118200
Merge toolsOfTrade changes from 'ShilohT-skillbalancing' into rebalancing-2014-12
2014-12-20 09:46:30 +10:00
621615a6f9
Merge fireball (Burst of Flames) changes from 'ShilohT-skillbalancing' into rebalancing-2014-12
2014-12-20 09:42:26 +10:00
6961e3608a
Merge branch 'skillbalancing' of https://github.com/ShilohT/habitrpg-shared into ShilohT-skillbalancing
2014-12-20 09:29:52 +10:00
95a6aa5586
Merge branch 'rebalancing-2014-12' of https://github.com/HabitRPG/habitrpg-shared into rebalancing-2014-12
...
Conflicts:
dist/habitrpg-shared.js
2014-12-20 08:48:21 +10:00
eeff8a80d6
Brought in groups.json from original branch
2014-12-18 22:01:52 -06:00
486d8a9bbf
chore(i18n): update locales
2014-12-18 22:56:34 +01:00
1fe3664731
ran grunt to compile coffeescript
2014-12-18 14:01:31 -06:00
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
4f5e813fcf
Merge pull request #396 from jamesleonis/develop
...
Incorrect grammar in Vice 2 quest notes
2014-12-18 19:48:46 +10:00
Verabird