91fe5fed97
Merge remote-tracking branch 'origin/new_mount_heads' into new_mount_heads
...
Conflicts:
common/dist/sprites/spritesmith-main-10.css
common/dist/sprites/spritesmith-main-10.png
common/dist/sprites/spritesmith-main-8.css
common/dist/sprites/spritesmith-main-8.png
common/dist/sprites/spritesmith-main-9.css
common/dist/sprites/spritesmith-main-9.png
2015-12-08 13:43:49 +01:00
faf2611ca3
making change for peppermit heads.
2015-12-08 13:36:25 +01:00
1769fc15f7
css files and sprite sheets
2015-12-08 13:22:13 +01:00
7628882f24
use new css class
2015-12-08 13:22:13 +01:00
d8b0774618
Add Mount_Icon images
2015-12-08 13:22:12 +01:00
3385cb807e
Merge pull request #6334 from bennyty/develop
...
Normalize theme audio volumes
2015-12-07 18:33:39 -06:00
7472d17c3a
Merge pull request #6335 from HabitRPG/sabrecat/peppermint-pets
...
Peppermint Hatching Potions
2015-12-07 15:18:42 -06:00
dd4ca5c476
refactor(modals): More readable invalid hatch check
2015-12-07 16:00:52 -05:00
7f2496b397
css files and sprite sheets
2015-12-06 00:16:36 +01:00
1b50197610
use new css class
2015-12-05 23:26:50 +01:00
545a802a03
Add Mount_Icon images
2015-12-05 23:17:44 +01:00
144e3003bb
Add Mount_Icon images
2015-12-05 23:17:39 +01:00
0f578b79ff
feat(pets): Peppermint Hatching Potions
...
Also fixes an issue where the pet hatching modal would appear when the user attempted to hatch a premium version of a quest pet.
2015-12-04 17:20:33 -05:00
ed944f83bf
Rebalance audio themes
2015-12-04 13:39:29 -05:00
a3665e7095
chore(image): Add vice2 quest image
2015-12-04 07:46:02 -06:00
aa00eae0d5
Merge pull request #6324 from ojeytonwilliams/unequip-notification-fix
...
Unequip notification fix
2015-12-03 14:01:45 -06:00
36df8138fc
Fixed template syntax.
2015-12-03 13:33:52 +01:00
d63cf64944
allow Fetch Recent Messages button to appear on newly-created groups
2015-12-03 10:03:59 +10:00
e907e2e4ee
adjust test for IAP GooglePlay to specify 21 gems
2015-12-03 07:23:31 +10:00
904dd595ed
change Google iap-live for Android mobile app gem purchases, at negue's request
2015-12-03 06:22:59 +10:00
b337efb01a
raise android gem purchase: 21 instead 20
2015-12-02 20:13:33 +01:00
dcd7cae312
Reverted changes related to multiple messages and changed handleTwoHanded to send single, clearer, messages.
2015-12-02 16:51:01 +01:00
6aa164ab31
chore(i18n): update locales
2015-12-02 07:42:29 -06:00
1add0084e8
chore(news): Update Bailey for GX3
2015-12-01 18:27:03 -05:00
5b943b4ab9
feat(event): Enable GaymerX armor
2015-12-01 18:11:04 -05:00
03222bf084
feat(content): Armoire and backgrounds 2015/12
2015-12-01 16:29:22 -05:00
483ff8cb67
Merge pull request #6275 from TheHollidayInn/tasks-add-push-to-bottom
...
Tasks add push to bottom
2015-12-01 14:20:02 -06:00
9366b22fef
Merge pull request #6320 from HabitRPG/sabrecat/fix-rehatch-modal
...
Fix modal display when rehatching pets
2015-12-01 14:16:21 -06:00
da35eb6067
user.ops functions can now send multiple messages at once. Clearer messages are sent when equipping/unequipping two-handed weapons.
2015-12-01 18:24:23 +01:00
ee7bfece06
Added tests for equipping and unequipping.
2015-12-01 17:58:12 +01:00
dd3218ebbd
refactor(modal): Remove unnecessary ternary
2015-11-30 16:43:46 -05:00
3d9b2047d0
updated static.styl with less classes
...
added key attribute to merchant array
changed item to merchant for clearity
added fallback for when no logo is found (no image can be provided)
updated guidelines
updated json
2015-11-30 22:33:12 +01:00
1643e3dbc6
test(modals): Rehatch scenario
2015-11-30 16:19:12 -05:00
3a20455cda
fix(modals): Rehatch pets
...
Corrects an issue with #6281 that would cause the pet hatching modal to fail to display if the pet had a value of -1 (i.e. raised to a mount and not yet re-hatched).
2015-11-30 16:11:13 -05:00
c4f3c2b1f4
change website FAQ to link to Overview for New Users on website instead of wiki
2015-12-01 07:08:07 +10:00
a42c671f1f
fix(model): Remove common.inviteParty
...
Per @vIiRuS
2015-11-30 15:48:46 -05:00
78890012c1
Merge pull request #6305 from markhowson/fix_narrow_guild_desc
...
Fixes #6252 - Guild description is too narrow on guild page
2015-11-30 13:16:59 -06:00
4663c7cf5e
Added translation functions to task types
2015-11-30 09:26:07 -06:00
ea87784575
tasks-fix-delete-message
2015-11-29 14:30:22 -06:00
6056a59cbe
minor update in the comment section
2015-11-29 19:12:45 +01:00
afecae9ef0
cleared merch.json of attributes that should not be translated
2015-11-29 19:05:32 +01:00
06ee603942
Initialized usr._temp when score function is skipped
2015-11-29 11:11:06 -06:00
5e105a0e45
allow moderators to reset flags for a chat message when there's only one flag
2015-11-29 19:46:27 +10:00
0dcba276a6
Fixed task push text and move ctrlPressed logic to rootScope.
2015-11-28 12:06:34 -06:00
42d1fd93f3
Merge branch 'kylestratis-issue-6043' into develop
2015-11-28 19:41:00 +10:00
7bf5300369
Merge branch 'issue-6043' of https://github.com/kylestratis/habitrpg into kylestratis-issue-6043 and remove redundant $and specifier
...
Conflicts:
migrations/mystery_items.js
2015-11-28 19:07:37 +10:00
6a535277a7
updated tab indent
...
added link in footer
renamed Merchandise to Merch (looks better in the footer)
moved css to static.styl
2015-11-27 23:25:56 +01:00
046e7bcfdc
chore(event): Revert NPCs
2015-11-27 13:10:54 -05:00
37378e8497
once more i try to add it back
2015-11-27 10:28:45 +01:00
a28a167437
merge
2015-11-27 10:25:08 +01:00
joyclark