Matteo Pagliazzi
72b2791bc4
refactor scoreTask
2015-12-08 14:41:42 +01:00
joyclark
faf2611ca3
making change for peppermit heads.
2015-12-08 13:36:25 +01:00
Joy Clark
1769fc15f7
css files and sprite sheets
2015-12-08 13:22:13 +01:00
Joy Clark
d8b0774618
Add Mount_Icon images
2015-12-08 13:22:12 +01:00
Sabe Jones
3385cb807e
Merge pull request #6334 from bennyty/develop
...
Normalize theme audio volumes
2015-12-07 18:33:39 -06:00
Matteo Pagliazzi
582aeafb4b
Merge branch 'develop' into api-v3
2015-12-06 17:17:20 +01:00
Sabe Jones
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
bennyty
ed944f83bf
Rebalance audio themes
2015-12-04 13:39:29 -05:00
Blade Barringer
a3665e7095
chore(image): Add vice2 quest image
2015-12-04 07:46:02 -06:00
Sabe Jones
aa00eae0d5
Merge pull request #6324 from ojeytonwilliams/unequip-notification-fix
...
Unequip notification fix
2015-12-03 14:01:45 -06:00
Matteo Pagliazzi
a6648fc638
add tags routes, misc fixes
2015-12-03 19:19:53 +01:00
Oliver Eyton-Williams
36df8138fc
Fixed template syntax.
2015-12-03 13:33:52 +01:00
Oliver Eyton-Williams
dcd7cae312
Reverted changes related to multiple messages and changed handleTwoHanded to send single, clearer, messages.
2015-12-02 16:51:01 +01:00
Blade Barringer
6aa164ab31
chore(i18n): update locales
2015-12-02 07:42:29 -06:00
Matteo Pagliazzi
62708d4365
cleanup
2015-12-02 11:30:58 +01:00
Matteo Pagliazzi
427c805ea5
fix user tests and misc changes
2015-12-02 11:22:53 +01:00
Sabe Jones
5b943b4ab9
feat(event): Enable GaymerX armor
2015-12-01 18:11:04 -05:00
Sabe Jones
03222bf084
feat(content): Armoire and backgrounds 2015/12
2015-12-01 16:29:22 -05:00
Sabe Jones
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
Oliver Eyton-Williams
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
Daniel Van Camp
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
Alys
c4f3c2b1f4
change website FAQ to link to Overview for New Users on website instead of wiki
2015-12-01 07:08:07 +10:00
Matteo Pagliazzi
93fcc7957e
fix trying to move completed todos
2015-11-30 20:22:22 +01:00
Matteo Pagliazzi
67bcfde6dc
implement move task
2015-11-30 20:14:53 +01:00
Matteo Pagliazzi
ebdfe4c49b
add checklists routes
2015-11-30 17:25:40 +01:00
Keith Holliday
4663c7cf5e
Added translation functions to task types
2015-11-30 09:26:07 -06:00
Keith Holliday
ea87784575
tasks-fix-delete-message
2015-11-29 14:30:22 -06:00
Daniel Van Camp
afecae9ef0
cleared merch.json of attributes that should not be translated
2015-11-29 19:05:32 +01:00
Matteo Pagliazzi
3002db3d75
add ability to update tasks, can pass additional fields to Model.sanitize at runtime
2015-11-29 19:05:24 +01:00
Keith Holliday
06ee603942
Initialized usr._temp when score function is skipped
2015-11-29 11:11:06 -06:00
Keith Holliday
0dcba276a6
Fixed task push text and move ctrlPressed logic to rootScope.
2015-11-28 12:06:34 -06:00
Matteo Pagliazzi
6c904330e7
misc fixes, add createTask route and ability to get tasks by type to getTasks route
2015-11-28 17:47:32 +01:00
Daniel Van Camp
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
Sabe Jones
046e7bcfdc
chore(event): Revert NPCs
2015-11-27 13:10:54 -05:00
Matteo Pagliazzi
5fa514b6fa
Merge branch 'develop' into api-v3
2015-11-27 17:05:29 +01:00
Daniel Van Camp
e881ba37e7
added static merch page
...
added lang en .json
modified pages.js with the extra merch page
2015-11-27 10:07:12 +01:00
Alys
9f53365648
add comment for refactoring to fix reset bug that doesn't unequip gear properly (e.g., https://github.com/HabitRPG/habitrpg/issues/6304 )
2015-11-27 06:13:14 +10:00
Sabe Jones
5d02b70be1
Merge pull request #6264 from ojeytonwilliams/two-handed-weapon-fix
...
Two-handed weapons no longer automatically equip unless desired. fixes #6231
2015-11-26 10:53:50 -06:00
Sabe Jones
9cbe94c602
chore(gulp): compile sprites
2015-11-26 11:25:25 -05:00
Daniel Van Camp
98a62c5cc9
fix the phoenix base on the right place now
...
(cherry picked from commit a8a2e3b74a
2015-11-26 11:22:57 -05:00
Sabe Jones
29a84e6666
feat(event): Habitica Thanksgiving
2015-11-25 17:06:52 -05:00
Sabe Jones
9671f4a09d
feat(event): November sprites
2015-11-25 13:33:36 -06:00
Oliver Eyton-Williams
707cd08a8b
Merged: updating two-handed tests to use arrow functions.
2015-11-25 12:12:22 +01:00
Alys
e04066e45f
Merge pull request #6228 from AminArria/timezone-information
...
Timezone information
2015-11-24 21:21:10 +10:00
Alys
69553260d3
revert refactor of preenHistory
2015-11-24 08:24:33 +10:00
Amin Arria
671d4aaecc
Change timezone text
2015-11-23 11:38:26 -04:30
Blade Barringer
7d49a8cbf8
Merge branch 'develop' into HabitRPG-sabrecat/modularize-statHelpers
2015-11-23 08:07:58 -06:00
Matteo Pagliazzi
a26f713e18
misc fixes, add ability to attach local auth to social user
2015-11-23 12:47:15 +01:00
Keith Holliday
b668829d85
Added ability to invert pushToBottom when holding down ctrl or cmd button
2015-11-22 15:57:14 -06:00
Alys
65c276c477
fix formatting in preenHistory
2015-11-22 21:08:51 +10:00
