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
afecae9ef0
cleared merch.json of attributes that should not be translated
2015-11-29 19:05:32 +01: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
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
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
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
9cbe94c602
chore(gulp): compile sprites
2015-11-26 11:25:25 -05:00
98a62c5cc9
fix the phoenix base on the right place now
...
(cherry picked from commit a8a2e3b74a
2015-11-26 11:22:57 -05:00
29a84e6666
feat(event): Habitica Thanksgiving
2015-11-25 17:06:52 -05:00
9671f4a09d
feat(event): November sprites
2015-11-25 13:33:36 -06:00
707cd08a8b
Merged: updating two-handed tests to use arrow functions.
2015-11-25 12:12:22 +01:00
e04066e45f
Merge pull request #6228 from AminArria/timezone-information
...
Timezone information
2015-11-24 21:21:10 +10:00
69553260d3
revert refactor of preenHistory
2015-11-24 08:24:33 +10:00
671d4aaecc
Change timezone text
2015-11-23 11:38:26 -04:30
7d49a8cbf8
Merge branch 'develop' into HabitRPG-sabrecat/modularize-statHelpers
2015-11-23 08:07:58 -06:00
65c276c477
fix formatting in preenHistory
2015-11-22 21:08:51 +10:00
1082bb1f81
refactor preenHistory from index.js to cron.js
2015-11-22 15:52:30 +10:00
83ea085c21
refactor api.shouldDo and associated code; fix new bug in sanitizeOptions()
2015-11-22 11:28:51 +10:00
728a94d199
improve coding style
2015-11-22 11:05:03 +10:00
a380c1aa30
refactor api.daysSince to a cron.js function not exposed on api
2015-11-22 10:48:15 +10:00
2f8b6d68e8
refactor api.startOfDay to a cron.js function not exposed on api
2015-11-22 07:13:44 +10:00
6183fd9e71
refactor api.startOfWeek to a cron.js function not exposed on api
2015-11-21 22:26:05 +10:00
e0784a9791
refactor sanitizeOptions from index.js to cron.js
2015-11-21 22:06:02 +10:00
a73662bab6
refactor api.dayMapping to DAY_MAPPING const, not exposed on api
2015-11-21 20:48:18 +10:00
fb17c3ae80
Merge branch 'develop' into sabrecat/modularize-statHelpers
2015-11-20 13:27:25 -05:00
72ea9426dd
fix(lint): Space infix operator (?)
2015-11-18 15:18:44 -05:00
ed443b490a
refactor(constant): Screaming camel MAX_LEVEL
2015-11-18 15:14:47 -05:00
31b68219d1
refactor(stats): Address PR comments
2015-11-18 15:06:55 -05:00
f94394127a
Remove unused var
2015-11-18 08:00:14 -06:00
9e557c43d3
Fix bug where seasonal items could not be purchased.
2015-11-18 07:58:01 -06:00
26b82dff4b
Fix bug where armoire items could not be repurchased.
2015-11-18 07:57:45 -06:00
cae267c0fa
Two-handed weapons no longer automatically equip unless desired.
2015-11-18 11:59:31 +01:00
94bf181301
Add noscript locales
2015-11-17 22:02:57 -06:00
0a7d7fc42d
Merge pull request #6251 from crookedneighbor/modularize-content-gear
...
Pull out gear into separate modules
2015-11-17 21:57:13 -06:00
4d415ee9c1
chore(i18n): update locales
2015-11-17 21:54:30 -06:00
fba35ea491
chore(i18n): update locales
2015-11-17 21:48:55 -06:00
6bd0ed76cc
Fixes #6524 . Correct spelling of community
2015-11-17 21:41:06 -06:00
71473a93ad
chore(i18n): update locales
2015-11-17 21:38:32 -06:00
1299afcb01
Merge branch 'develop' into gauthamchandra-feature/warning-for-disabled-js
2015-11-17 21:28:22 -06:00
37e08e8d5d
Converted noscript text into translatable strings
2015-11-17 22:22:55 -05:00
a11048b604
Split out wondercon gear into separate module
2015-11-17 17:16:38 -06:00
f58b3eee64
Move special gear into own subdirectory
2015-11-17 17:06:00 -06:00
7d2643063f
fix(math-helpers): diminishingReturns parameter logic
2015-11-17 16:00:18 -05:00
4bf20959dd
refactor(stats): Math helpers ES2015 module
2015-11-17 15:41:26 -05:00
195b39561b
Move contributor gear to own module
2015-11-17 09:01:38 -06:00
2bac9c3c17
Separate out backer gear into own module
2015-11-17 08:17:40 -06:00
03c1a957f6
Correct ownsItem function to allow owning item if user has ever previously owned the item.
2015-11-17 08:13:20 -06:00
3000517b06
Fix bug where any backer or contributor item could be purchased.
2015-11-16 21:47:46 -06:00
639dfb31d7
Pull out gear into separate modules
2015-11-16 17:29:13 -06:00
c352a30d4e
chore(news): Bailey 2015-11-16
...
Also sprite recompile to incorporate sticker promo image.
2015-11-16 17:26:44 -05:00
Daniel Van Camp