Blade Barringer
|
627da76b49
|
Merge branch 'develop' into api-v3
|
2015-11-18 09:09:49 -06:00 |
|
Blade Barringer
|
f94394127a
|
Remove unused var
|
2015-11-18 08:00:14 -06:00 |
|
Blade Barringer
|
9e557c43d3
|
Fix bug where seasonal items could not be purchased.
|
2015-11-18 07:58:01 -06:00 |
|
Blade Barringer
|
26b82dff4b
|
Fix bug where armoire items could not be repurchased.
|
2015-11-18 07:57:45 -06:00 |
|
Blade Barringer
|
08c4ec5557
|
Merge branch 'develop' into api-v3
|
2015-11-17 23:15:15 -06:00 |
|
Blade Barringer
|
a11048b604
|
Split out wondercon gear into separate module
|
2015-11-17 17:16:38 -06:00 |
|
Blade Barringer
|
f58b3eee64
|
Move special gear into own subdirectory
|
2015-11-17 17:06:00 -06:00 |
|
Blade Barringer
|
195b39561b
|
Move contributor gear to own module
|
2015-11-17 09:01:38 -06:00 |
|
Blade Barringer
|
2bac9c3c17
|
Separate out backer gear into own module
|
2015-11-17 08:17:40 -06:00 |
|
Blade Barringer
|
03c1a957f6
|
Correct ownsItem function to allow owning item if user has ever previously owned the item.
|
2015-11-17 08:13:20 -06:00 |
|
Blade Barringer
|
3000517b06
|
Fix bug where any backer or contributor item could be purchased.
|
2015-11-16 21:47:46 -06:00 |
|
Blade Barringer
|
e6a5d08150
|
Merge branch 'develop' into api-v3
|
2015-11-16 17:34:30 -06:00 |
|
Blade Barringer
|
639dfb31d7
|
Pull out gear into separate modules
|
2015-11-16 17:29:13 -06:00 |
|
Blade Barringer
|
61948e1ca5
|
Add filter to lodash import.
|
2015-11-16 12:22:00 -06:00 |
|
Blade Barringer
|
c3f8bb0726
|
Correct count module to use correct lodash 3 syntax
|
2015-11-16 12:10:58 -06:00 |
|
Blade Barringer
|
9bf1ebdb0f
|
Remove last of coffee files
|
2015-11-16 08:14:42 -06:00 |
|
Blade Barringer
|
f20336861a
|
Correct lodash syntax
|
2015-11-16 08:07:20 -06:00 |
|
Blade Barringer
|
00055ad055
|
Merge branch 'develop' into api-v3
|
2015-11-15 14:57:41 -06:00 |
|
Blade Barringer
|
2a7dfe09a0
|
Move user can own quest categories constant to constants module.
|
2015-11-15 12:27:16 -06:00 |
|
Blade Barringer
|
40cee42e03
|
Remove unneeded return statement
|
2015-11-15 11:04:17 -06:00 |
|
Blade Barringer
|
6ec864ea4e
|
Remove unused src files in content directory
|
2015-11-15 11:03:30 -06:00 |
|
Blade Barringer
|
1a31c26330
|
Add item list to common constants module
|
2015-11-15 11:03:17 -06:00 |
|
Blade Barringer
|
411946e487
|
Modularize mystery sets
|
2015-11-15 10:08:40 -06:00 |
|
Blade Barringer
|
600f3e4554
|
Extract classes, events and gearTypes into constants file.
|
2015-11-15 09:47:06 -06:00 |
|
Blade Barringer
|
b13b2d0f62
|
Remove coffee content index file
|
2015-11-15 09:28:26 -06:00 |
|
Blade Barringer
|
e5d99ce271
|
Convert common files to es2015.
|
2015-11-15 08:16:55 -06:00 |
|
Matteo Pagliazzi
|
38749eae1b
|
fix i18n.js so that it supports lodash 3
|
2015-11-13 17:30:12 +01:00 |
|
Blade Barringer
|
6e8e1648d9
|
Merge branch 'develop' into api-v3
|
2015-11-13 07:38:24 -06:00 |
|
Blade Barringer
|
5ebead68ab
|
Remove coffee version of i18n
|
2015-11-11 21:24:21 -06:00 |
|
Blade Barringer
|
774a42d67e
|
Convert coffee files to JS
|
2015-11-11 20:32:00 -06:00 |
|
Blade Barringer
|
c5445dc426
|
Merge branch 'develop' into api-v3
|
2015-11-11 19:42:39 -06:00 |
|
Sabe Jones
|
83b61f9aa3
|
Merge branch 'develop' into sabrecat/pet-201511
Conflicts:
common/dist/sprites/spritesmith-main-5.css
common/dist/sprites/spritesmith-main-5.png
common/dist/sprites/spritesmith-main-6.css
common/dist/sprites/spritesmith-main-6.png
common/dist/sprites/spritesmith-main-7.css
common/dist/sprites/spritesmith-main-7.png
common/dist/sprites/spritesmith-main-8.css
common/dist/sprites/spritesmith-main-8.png
common/dist/sprites/spritesmith-main-9.css
common/dist/sprites/spritesmith-main-9.png
|
2015-11-11 18:36:25 -05:00 |
|
Sabe Jones
|
eba2ac386e
|
feat(pets): November quest
Fully functional commit. Missing only Bailey and the quest scroll sprite.
|
2015-11-11 17:23:16 -05:00 |
|
Matteo Pagliazzi
|
4f21ee290b
|
finish upgrading to lodash 3
|
2015-11-11 11:08:16 +01:00 |
|
Matteo Pagliazzi
|
3795b1d151
|
wip: starts upgrading lodash to v3
|
2015-11-11 10:32:49 +01:00 |
|
Sabe Jones
|
502e7f0af2
|
Merge branch 'develop' into sabrecat/more-modals
|
2015-11-03 14:29:23 -05:00 |
|
Sabe Jones
|
6b3fcd3d11
|
fix(content): Correct stats for Royal Robes
...in newtype content file
|
2015-11-02 17:34:59 -05:00 |
|
Sabe Jones
|
510080325d
|
fix(content): Correct missing Armoire items
...in newstyle content files
|
2015-11-02 17:33:03 -05:00 |
|
Sabe Jones
|
e74c83be2e
|
feat(content): November backgrounds and Armoire
|
2015-11-02 17:28:20 -05:00 |
|
Sabe Jones
|
2cb4e80019
|
chore(event): End Fall Festival
|
2015-11-02 12:55:48 -05:00 |
|
Sabe Jones
|
9227dd89be
|
fix(event): Extend festival one day
|
2015-11-01 13:27:36 -06:00 |
|
Alys
|
fa060bf6cd
|
revert a commit that went live prematurely when I was distracted - sorry for commit spam
|
2015-10-31 19:26:05 +09:00 |
|
Alys
|
8f21fb2419
|
set lastCron to current moment if the user's timezone has changed when they authenticate
|
2015-10-31 18:34:35 +09:00 |
|
Blade Barringer
|
391e09dd33
|
Fix auto-redirect
|
2015-10-30 22:28:11 -05:00 |
|
Alys
|
154fcb4f8c
|
make daysMissed have a negative value for a lastCron in the future so that setting your PC time backwards doesn't trigger cron
|
2015-10-31 13:00:42 +10:00 |
|
Alys
|
34c51fc710
|
revert recent cron change (better code incoming; what WAS I thinking)
|
2015-10-31 10:59:41 +10:00 |
|
Alys
|
161069cfec
|
prevent cron running if the lastCron date is in the future
|
2015-10-31 04:12:43 +10:00 |
|
Blade Barringer
|
dd09633d31
|
Merge branch 'locks-auto-equip' into develop
|
2015-10-29 12:25:18 -05:00 |
|
Blade Barringer
|
6ff904bd5a
|
Merge branch 'develop' into czan-develop
|
2015-10-29 08:40:03 -05:00 |
|
Matteo Pagliazzi
|
01373882c6
|
make error notification persistent, change text and make it translatable
|
2015-10-28 19:42:26 +01:00 |
|