 Damien Gourbiere
|
1c0df66eed
|
Issue #5978 - Corrected grammar in gear.jason
|
2015-10-01 22:45:25 -04:00 |
|
|
Blade Barringer
|
be3decf859
|
Merge branch 'develop' into refactor-content
|
2015-10-01 21:20:04 -05:00 |
|
|
Blade Barringer
|
a7fe29e04e
|
Add comment to quest block
|
2015-10-01 17:26:21 -05:00 |
|
|
Sabe Jones
|
22c69c7e2f
|
fix(magic-potions): Correct potion list merge
|
2015-10-01 16:53:11 -04:00 |
|
|
Sabe Jones
|
8e69681718
|
chore(news): Bailey 2015-10-01
|
2015-10-01 15:48:18 -04:00 |
|
|
Sabe Jones
|
5349bc7312
|
chore(gulp): Compile sprites
|
2015-10-01 14:27:21 -05:00 |
|
|
Sabe Jones
|
fc46023561
|
feat(armoire): October content
(cherry picked from commit 2b2a85838dbc4539d41e6e2d508374b0960238d6)
Conflicts:
common/dist/sprites/habitrpg-shared.css
common/dist/sprites/spritesmith-main-3.png
common/dist/sprites/spritesmith-main-4.css
common/dist/sprites/spritesmith-main-4.png
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-10-01 14:21:01 -05:00 |
|
|
Sabe Jones
|
f4c18bb7f3
|
chore(gulp): Compile sprites
|
2015-10-01 14:11:22 -05:00 |
|
|
Sabe Jones
|
233211adc9
|
Merge pull request #5962 from HabitRPG/sabrecat/magic-potions
Magic Potions!
|
2015-10-01 14:04:14 -05:00 |
|
|
Sabe Jones
|
3d38777ec8
|
fix(content): Correctly generate api.hatchingPotions
|
2015-10-01 14:54:52 -04:00 |
|
|
Sabe Jones
|
bebc4556ea
|
Merge pull request #5992 from crookedneighbor/magic-potions-row
Put magic pets on their own row
|
2015-10-01 13:48:42 -05:00 |
|
|
Blade Barringer
|
0f8c3e03c2
|
Correct mount mixin
|
2015-10-01 13:25:00 -05:00 |
|
|
Blade Barringer
|
c8afac9580
|
Put magic pets on their own row
|
2015-10-01 13:21:15 -05:00 |
|
|
Blade Barringer
|
6667adb983
|
Reorder helper keys
|
2015-10-01 12:32:40 -05:00 |
|
|
Blade Barringer
|
86ec40e43d
|
Add comment to gear file
|
2015-10-01 12:32:22 -05:00 |
|
|
Blade Barringer
|
3c933eaf4e
|
Add comment to food file
|
2015-10-01 12:31:08 -05:00 |
|
|
Blade Barringer
|
ee2134dcb7
|
Add comment to eggs file
|
2015-10-01 12:30:51 -05:00 |
|
|
Blade Barringer
|
5f4aa427fc
|
Add comment to pets and mounts file
|
2015-10-01 12:30:36 -05:00 |
|
|
Timothy Cyrus
|
ad6c0b322a
|
Update README.md
Change all Readme Badges to SVG's
|
2015-10-01 08:53:47 -04:00 |
|
|
Blade Barringer
|
6c9fab254d
|
Add coffeescript dependency back in
|
2015-09-30 22:49:19 -05:00 |
|
|
Blade Barringer
|
08e6759da2
|
Fix path to content
|
2015-09-30 22:38:23 -05:00 |
|
|
Blade Barringer
|
6ad7b6ba4c
|
Correct content in analytics
|
2015-09-30 20:56:40 -05:00 |
|
|
Blade Barringer
|
faf5d263e0
|
Correct gear sets
|
2015-09-30 20:12:14 -05:00 |
|
|
Blade Barringer
|
6ed417842f
|
Move gulp-babel to dependency
|
2015-09-30 19:55:20 -05:00 |
|
|
Blade Barringer
|
02126533e7
|
Allow gulp babelify to exist in prod
|
2015-09-30 19:51:19 -05:00 |
|
|
Blade Barringer
|
b96d3fc3fc
|
Add special back
|
2015-09-30 19:50:57 -05:00 |
|
|
Blade Barringer
|
3be24456ec
|
Move special and armoire gear to own module
|
2015-09-30 19:04:09 -05:00 |
|
|
Sabe Jones
|
3968acecb4
|
chore(news): Bailey 2015-09-30
|
2015-09-30 15:39:38 -04:00 |
|
|
Sabe Jones
|
9afaa92c2e
|
feat(magic-potions): Clarify drop behavior
|
2015-09-30 15:31:09 -04:00 |
|
|
Blade Barringer
|
0199dcadf3
|
Add armoire set
|
2015-09-29 21:38:45 -05:00 |
|
|
Blade Barringer
|
c56e7ba44e
|
Move base euqipment to own module
|
2015-09-29 17:58:37 -05:00 |
|
|
Blade Barringer
|
ff4dae8f89
|
Move mystery set into own module
|
2015-09-29 17:53:32 -05:00 |
|
|
Blade Barringer
|
e9a4465a4c
|
Merge branch 'develop' into refactor-content
|
2015-09-29 17:30:33 -05:00 |
|
|
Blade Barringer
|
5c0a0e1d18
|
Compile css
|
2015-09-29 17:30:08 -05:00 |
|
|
Blade Barringer
|
228b8e030e
|
Remove only form test
|
2015-09-29 17:20:15 -05:00 |
|
|
Blade Barringer
|
152cb99750
|
Add spell tests
|
2015-09-29 12:58:53 -05:00 |
|
|
Blade Barringer
|
9de2ee473d
|
Correct gear test
|
2015-09-29 12:54:45 -05:00 |
|
|
Blade Barringer
|
26d73d0bc1
|
Create user default test
|
2015-09-29 12:53:39 -05:00 |
|
|
Blade Barringer
|
61589ca262
|
Add armoire and potion locale tests
|
2015-09-29 12:44:35 -05:00 |
|
|
Blade Barringer
|
c846cfd653
|
Add background content test
|
2015-09-29 12:38:34 -05:00 |
|
|
Blade Barringer
|
0fc41abe25
|
Add FAQ content test
|
2015-09-29 12:33:55 -05:00 |
|
|
Blade Barringer
|
8676e660a8
|
Correct rogue shield
|
2015-09-29 12:20:57 -05:00 |
|
|
Blade Barringer
|
cc0eb7d672
|
Add gear content test
|
2015-09-29 09:00:27 -05:00 |
|
|
Blade Barringer
|
8e9a08ba46
|
Add helper to run all tests in directory
|
2015-09-29 08:59:42 -05:00 |
|
|
Blade Barringer
|
400f82b2d5
|
Add food content test
|
2015-09-29 08:12:10 -05:00 |
|
|
Blade Barringer
|
0af658dab7
|
Add hatching potions test
|
2015-09-29 08:09:43 -05:00 |
|
|
Blade Barringer
|
54e910d67a
|
Add egg content test
|
2015-09-29 08:07:07 -05:00 |
|
|
Blade Barringer
|
e27751c1be
|
Organize quest tests by key
|
2015-09-29 08:06:48 -05:00 |
|
|
Blade Barringer
|
bc47d44acc
|
Add in text for evil santa quests
|
2015-09-29 08:00:53 -05:00 |
|
|
Blade Barringer
|
f6aa316eb1
|
Create quest content test
|
2015-09-29 07:55:35 -05:00 |
|