2d862593ae
Compile sprites
2015-09-28 08:50:20 -05:00
6902d9aa2f
swap README files for en and zk. What WAS I thinking?
2015-09-27 06:52:23 +10:00
7b4c50bdb7
update locales edit/translate instructions
2015-09-27 06:13:56 +10:00
b27a12b54d
Merge pull request #5973 from HabitRPG/sabrecat/quest-analytics
...
Track daily quest progress in server-side analytics
2015-09-24 20:57:07 -05:00
5d6efd4f9d
fix(sprite): clean up horse
2015-09-24 15:52:41 -05:00
0ceba13e7c
feat(analytics): Track daily progress
...
Adds progressUp and progressDown event properties to the Cron analytics event. With these, we can total up the site population's quest progress, both positive and negative, for the purposes of estimating likely pace of battle with a World Boss. Note that these values are tracked regardless of whether or not the user is currently questing.
2015-09-24 16:40:20 -04:00
009c92b532
feat(content): September sub items and customizations
2015-09-23 15:23:42 -04:00
6a6b67b9c1
Merge pull request #5909 from HabitRPG/sabrecat/social-buttons
...
Front page Tweet button
2015-09-22 17:38:47 -05:00
87f6af346a
fix(misc): Tweaks
...
* Updates the text shown for Mystic Hourglasses in the inventory to account for new features.
* Fixes the date range for the Fall Festival to correctly start September 21.
* Updates test for the Inventory Controller to use lodash for object key iteration.
2015-09-21 13:59:00 -04:00
b3297383d3
Merge pull request #5954 from HabitRPG/sabrecat/fall-2015
...
Fall Festival 2015
2015-09-21 12:06:40 -05:00
b608e061a5
test(drops): Generalize
2015-09-21 12:57:35 -04:00
fd0dcbebde
chore(i18n): update locales
2015-09-19 15:19:47 -05:00
87197bea8a
Merge branch 'LuneFox-develop' into develop
2015-09-19 10:41:47 -05:00
2a530a207d
Rename translation key
2015-09-19 10:41:21 -05:00
8ae1c35b27
added string for askQuestion
2015-09-19 01:57:30 +03:00
f7478aa81d
add value 100 (gold cost) to Enchanted Armoire items that were missing it
2015-09-19 08:46:04 +10:00
3e8a3ee5f4
feat(event): Fall Festival 2015
2015-09-18 15:19:59 -04:00
6449fbdbc0
feat(event): Fall 2015 sprites
2015-09-18 12:42:55 -05:00
eb0dd636c1
feat(hourglass): Confirm before buy
2015-09-16 17:40:25 -04:00
3bfeb15715
test(hourglass): TDD for Time Travel filtering
2015-09-16 15:27:19 -04:00
c8cc01fc44
feat(hourglass): Buy pets/mounts
...
Functionally complete as of this commit. Further commits will provide more polish and refactoring.
2015-09-16 14:35:43 -04:00
ce764ca28e
WIP(hourglass): Mystery sets API route
2015-09-15 15:41:57 -04:00
2ce52e980d
feat(hourglass): Buy pets/mounts
2015-09-15 14:55:38 -04:00
66a8be526b
WIP(hourglass): Error catches
2015-09-15 12:40:01 -05:00
bc16ec1729
Merge branch 'develop' into sabrecat/timetravel-stable
2015-09-15 11:32:28 -05:00
38e07246da
chore(i18n): update locales
2015-09-13 18:38:59 -05:00
737b4703e6
Fix markdown bug in faq. Fixes #5920
2015-09-13 18:36:36 -05:00
d573f3c53d
Merge branch 'melarish-Mystery_items_already_owned' into develop
2015-09-13 18:28:18 -05:00
909ab4eb35
remove extra line breaks from "What are some sample tasks?" FAQ question - fixes https://github.com/HabitRPG/habitrpg/issues/5920
2015-09-14 07:07:12 +10:00
7aad958062
Merge pull request #5922 from crookedneighbor/gulpify
...
Gulpify the sprites tasks
2015-09-13 02:15:05 -05:00
41458fbd5b
chore(i18n): update locales
2015-09-12 22:26:30 -05:00
b65c8e3b16
Change directory name from guides to scenes
2015-09-12 21:23:41 -05:00
1df4cf81dd
compile sprites using gulp
2015-09-12 11:22:15 -05:00
2c2ab97666
Move larger sprites to separate folder
2015-09-12 11:09:08 -05:00
384ee42bca
Remove unused sprites
2015-09-12 08:35:18 -05:00
fbfd2ef0ea
add a missing closing bracket to the end of webFaqAnswer6
2015-09-12 23:22:47 +10:00
fbaa5d4321
add new audi theme from LuneFox, moved themes to alphabetical order, adjusted file permissions for Watts Theme
2015-09-12 11:05:31 +10:00
6396b064d2
fix(social): Localize Tweet button
2015-09-10 18:51:19 -04:00
45c8bb06e2
Revert "feat(modals): Simplified scroll drop"
...
This reverts commit 8b4d34da00
2015-09-10 18:08:51 -04:00
05cf144630
Pulled and merged
2015-09-09 23:23:45 +01:00
8b4d34da00
feat(modals): Simplified scroll drop
2015-09-09 14:27:34 -04:00
41b4d497f7
Merge branch 'develop' into sabrecat/pet-201509
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
common/dist/sprites/spritesmith2.css
common/dist/sprites/spritesmith2.png
common/dist/sprites/spritesmith3.css
common/dist/sprites/spritesmith3.png
common/dist/sprites/spritesmith4.css
common/dist/sprites/spritesmith4.png
2015-09-08 13:25:10 -05:00
2bddd79ffd
Some things I tried
2015-09-08 13:59:34 +01:00
9421c63ac9
fix(FAQ): Remove sample task anchors
2015-09-07 21:58:56 -04:00
325fa976f6
chore(i18n): update locales
2015-09-07 15:27:52 -05:00
c9af8e60b8
Adjust formatting
2015-09-06 20:29:09 -05:00
e32de87991
Adjust numbering of faq.js
2015-09-06 19:44:37 -05:00
ebc069747b
Zero index faq strings
2015-09-06 19:43:52 -05:00
6fd2b9e537
Update content with web faq
2015-09-06 17:13:04 -05:00
6a1d4adcda
Merge branch 'develop' into HabitRPG-sabrecat/faq
2015-09-06 17:10:45 -05:00
Blade Barringer