Commit graph

11046 commits

Author SHA1 Message Date
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
fd0dcbebde chore(i18n): update locales 2015-09-19 15:19:47 -05:00
Blade Barringer
87197bea8a Merge branch 'LuneFox-develop' into develop 2015-09-19 10:41:47 -05:00
Blade Barringer
2a530a207d Rename translation key 2015-09-19 10:41:21 -05:00
Blade Barringer
ca6137a24e Remove unneeded file 2015-09-19 09:11:51 -05:00
LuneFox
512b959cab Merge pull request #1 from LuneFox/origin
#5955
2015-09-19 02:01:43 +03:00
LuneFox
8ae1c35b27 added string for askQuestion 2015-09-19 01:57:30 +03:00
Alys
f7478aa81d add value 100 (gold cost) to Enchanted Armoire items that were missing it 2015-09-19 08:46:04 +10:00
LuneFox
91a0e0452e added match for askQuestion 2015-09-19 01:12:30 +03:00
LuneFox
ec336c4f88 added link to the newbies guild 2015-09-19 01:11:27 +03:00
Sabe Jones
bbf9f45aa4 fix(test): Seasonal food drop 2015-09-18 15:32:24 -04:00
Sabe Jones
aed39a206d fix(services): Remove accidental WIP inclusion 2015-09-18 15:24:56 -04:00
Sabe Jones
3e8a3ee5f4 feat(event): Fall Festival 2015 2015-09-18 15:19:59 -04:00
Sabe Jones
6449fbdbc0 feat(event): Fall 2015 sprites 2015-09-18 12:42:55 -05:00
Kevin Gisi
ff52aca587 Merge pull request #5951 from HabitRPG/revert-5943-revert-5912-group-remove-party-invites-when-last-member-leaves
Revert "Revert "Removed user's party invites when last user leaves pa…
2015-09-17 20:27:52 -07:00
Kevin Gisi
4525ee5358 Revert "Revert "Removed user's party invites when last user leaves party"" 2015-09-17 23:27:21 -04: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
Kevin Gisi
e15cc9ec82 Merge pull request #5943 from HabitRPG/revert-5912-group-remove-party-invites-when-last-member-leaves
Revert "Removed user's party invites when last user leaves party"
2015-09-17 01:08:37 -07:00
Kevin Gisi
c26cd1fe5b Revert "Removed user's party invites when last user leaves party" 2015-09-17 04:00:07 -04:00
Sabe Jones
347d028af7 fix(API): Fix inaccessible route
Mystic Hourglass routes aren't yet used by live code.
2015-09-17 01:57:28 -04: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
Blade Barringer
8881dbc034 Remove uneeded blank spaces 2015-09-16 20:01:42 -05:00
Sabe Jones
09ccb9584f Merge pull request #5938 from HabitRPG/sabrecat/timetravel-stable
Time Travel Stable
2015-09-16 18:31:48 -05:00
Sabe Jones
15cddabd80 fix(test): Remove only 2015-09-16 19:21:05 -04:00
Sabe Jones
f8db8f597a refactor(test): Give user mystery items
...instead of stubbing out timeTravelerStore
2015-09-16 19:16:21 -04:00
Sabe Jones
9be0990217 chore(news): Bailey 2015-09-16 2015-09-16 18:34:20 -04:00
Sabe Jones
eb0dd636c1 feat(hourglass): Confirm before buy 2015-09-16 17:40:25 -04:00
Sabe Jones
fb50f27fa7 fix(hourglass): Use method on $scope 2015-09-16 16:46:12 -04:00
Sabe Jones
98cd8364c6 feat(hourglass): Individual filter functions 2015-09-16 16:35:04 -04:00
Sabe Jones
2bde07fa1c fix(test): Call hasAll correctly 2015-09-16 16:12:29 -04:00
Sabe Jones
7cc29810f3 fix(test): inject Content
Also refactors to remove lodash where it's overkill.
2015-09-16 16:01:13 -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
25b133c562 Merge branch 'develop' into sabrecat/timetravel-stable 2015-09-16 12:48:12 -04:00
Blade Barringer
c9c169a0fb Merge pull request #5912 from TheHollidayInn/group-remove-party-invites-when-last-member-leaves
Removed user's party invites when last user leaves party
2015-09-16 07:59:32 -05:00
Blade Barringer
f71e3e20eb Merge pull request #5934 from HabitRPG/adjustments_to_group_front_end_only
Adjustments to group quest behavior
2015-09-15 18:57:32 -05:00
Blade Barringer
4c84728873 Removes quest from group if quest leader is booted 2015-09-15 18:10:31 -05:00
Blade Barringer
a655242c49 Correct test assertion 2015-09-15 17:38:22 -05:00