Commit Graph

882 Commits

Author SHA1 Message Date
Blade Barringer
b7cd46a6fe Move subscription blocks to separate module 2015-09-19 19:42:47 -05:00
Blade Barringer
4cb7ae4f6f Add translator 2015-09-19 19:42:38 -05:00
Blade Barringer
110480be5a Use single quotes 2015-09-19 19:37:40 -05:00
Blade Barringer
1c0943b5a4 Add parens 2015-09-19 19:36:54 -05:00
Blade Barringer
c01795af2a Move user defaults to separate module 2015-09-19 19:36:35 -05:00
Blade Barringer
6665339229 Remove dist location variable. Wasn't working for some reason :( 2015-09-19 19:29:56 -05:00
Blade Barringer
b51ca509ca Change to export syntax 2015-09-19 19:29:15 -05:00
Blade Barringer
85a16b62e5 Add babel task and move to src directory 2015-09-17 17:42:53 -05:00
Blade Barringer
993b568ad8 Add mount names for all drop pets and make creation more programmic 2015-09-17 12:43:42 -05:00
Blade Barringer
df5a434d71 Move drop eggs into separate module 2015-09-17 08:45:35 -05:00
Blade Barringer
c64fd6e321 Move drop eggs to separate file 2015-09-17 08:42:21 -05:00
Blade Barringer
550ceb8701 Remove uneeded .js extension 2015-09-17 08:09:47 -05:00
Blade Barringer
4681fc6c96 Move card types to separate file 2015-09-17 08:08:09 -05:00
Blade Barringer
d20354dd47 Es2015ify the js content 2015-09-17 08:03:33 -05:00
Blade Barringer
eaaac546b9 Move translator file into helpers folder 2015-09-17 07:47:23 -05:00
Blade Barringer
a1d7ad70af Move spells to won file 2015-09-17 07:41:19 -05:00
Blade Barringer
eecc4e4a22 Rename mystery sets module 2015-09-16 20:29:26 -05:00
Blade Barringer
50d7adcae8 Extract mystery items into module 2015-09-16 20:28:46 -05:00
Blade Barringer
ccdcd32174 Extract time traveler stable into separate module 2015-09-16 20:22:42 -05:00
Blade Barringer
504a2e7a52 Move events to own module 2015-09-16 20:12:09 -05:00
Sabe Jones
eb0dd636c1 feat(hourglass): Confirm before buy 2015-09-16 17:40:25 -04:00
Sabe Jones
3bfeb15715 test(hourglass): TDD for Time Travel filtering 2015-09-16 15:27:19 -04:00
Sabe Jones
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
Sabe Jones
ce764ca28e WIP(hourglass): Mystery sets API route 2015-09-15 15:41:57 -04:00
Sabe Jones
2ce52e980d feat(hourglass): Buy pets/mounts 2015-09-15 14:55:38 -04:00
Sabe Jones
66a8be526b WIP(hourglass): Error catches 2015-09-15 12:40:01 -05:00
Sabe Jones
bc16ec1729 Merge branch 'develop' into sabrecat/timetravel-stable 2015-09-15 11:32:28 -05:00
Blade Barringer
38e07246da chore(i18n): update locales 2015-09-13 18:38:59 -05:00
Blade Barringer
737b4703e6 Fix markdown bug in faq. Fixes #5920 2015-09-13 18:36:36 -05:00
Blade Barringer
d573f3c53d Merge branch 'melarish-Mystery_items_already_owned' into develop 2015-09-13 18:28:18 -05:00
Alys
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
Blade Barringer
7aad958062 Merge pull request #5922 from crookedneighbor/gulpify
Gulpify the sprites tasks
2015-09-13 02:15:05 -05:00
Blade Barringer
41458fbd5b chore(i18n): update locales 2015-09-12 22:26:30 -05:00
Blade Barringer
b65c8e3b16 Change directory name from guides to scenes 2015-09-12 21:23:41 -05:00
Blade Barringer
1df4cf81dd compile sprites using gulp 2015-09-12 11:22:15 -05:00
Blade Barringer
2c2ab97666 Move larger sprites to separate folder 2015-09-12 11:09:08 -05:00
Blade Barringer
384ee42bca Remove unused sprites 2015-09-12 08:35:18 -05:00
Alys
fbfd2ef0ea add a missing closing bracket to the end of webFaqAnswer6 2015-09-12 23:22:47 +10:00
Alys
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
melarish
05cf144630 Pulled and merged 2015-09-09 23:23:45 +01:00
Sabe Jones
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
Mel Marley
2bddd79ffd Some things I tried 2015-09-08 13:59:34 +01:00
Sabe Jones
9421c63ac9 fix(FAQ): Remove sample task anchors 2015-09-07 21:58:56 -04:00
Blade Barringer
325fa976f6 chore(i18n): update locales 2015-09-07 15:27:52 -05:00
Blade Barringer
c9af8e60b8 Adjust formatting 2015-09-06 20:29:09 -05:00
Blade Barringer
e32de87991 Adjust numbering of faq.js 2015-09-06 19:44:37 -05:00
Blade Barringer
ebc069747b Zero index faq strings 2015-09-06 19:43:52 -05:00
Blade Barringer
6fd2b9e537 Update content with web faq 2015-09-06 17:13:04 -05:00
Blade Barringer
6a1d4adcda Merge branch 'develop' into HabitRPG-sabrecat/faq 2015-09-06 17:10:45 -05:00
Blade Barringer
2fcc7df218 Change name of locales keys 2015-09-06 16:36:21 -05:00