Commit Graph

20 Commits

Author SHA1 Message Date
Matteo Pagliazzi
b0b6864f1c chore(i18n): update locales 2015-03-16 19:56:35 +01:00
Tyler Renelle
812493fec5 feat(tour): Refactor the Justin Guide to be much more streamlined and interactive. Backdrop focuses user on present task. Chapterized guides 2015-03-10 15:40:18 -06:00
Blade Barringer
9e6c268a97 chore(grunt compile:sprites) 2015-03-09 13:42:35 -05:00
Sabe Jones
27446da338 chore(grunt): compile sprites 2015-03-03 21:49:07 -06:00
Sabe Jones
3d3438e074 chore(grunt): Compile sprites 2015-02-24 20:45:50 -06:00
Blade Barringer
016e359690 Fixes #4749 2015-02-24 16:58:48 -06:00
Blade Barringer
5aa4015249 Refactored pet display name changes 2015-02-22 12:12:38 -05:00
Bill Parrott
789575d6fb Merge branch 'develop' into task-difficulty-context-classes 2015-02-17 22:31:27 -06:00
Sabe Jones
87b13d5fc8 chore(grunt): compile sprites 2015-02-17 20:46:40 -06:00
Bill Parrott
9cf4d9086b be more explicit about priority value vs context class 2015-02-16 15:49:31 -06:00
Bill Parrott
812599cb77 add difficulty context class to task list items 2015-02-16 15:02:04 -06:00
Matteo Pagliazzi
34d8a910e3 chore(i18n): update locales 2015-02-14 17:56:11 +01:00
Blade Barringer
e605acffbe Corrected paths or nodemonignore 2015-02-12 21:45:37 -06:00
Blade Barringer
cb7f382a85 Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
Conflicts:
	common/dist/scripts/habitrpg-shared.js
	common/dist/sprites/habitrpg-shared.css
2015-02-12 15:40:12 -06:00
Blade Barringer
51b90afb34 Compiled everything 2015-02-12 13:49:34 -06:00
Blade Barringer
9ddb5e35fb Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
Conflicts:
	common/dist/scripts/habitrpg-shared.js
	common/dist/sprites/habitrpg-shared.css
	common/img/sprites/spritesmith/customize/hair/hair_base_10_TRUEred.png
	common/img/sprites/spritesmith/customize/hair/hair_base_11_TRUEred.png
	common/img/sprites/spritesmith/customize/hair/hair_base_12_TRUEred.png
	common/img/sprites/spritesmith/customize/hair/hair_base_13_TRUEred.png
	common/img/sprites/spritesmith/customize/hair/hair_base_14_TRUEred.png
	common/img/sprites/spritesmith/customize/hair/hair_base_9_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_10_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_10_TRUred.png
	img/sprites/spritesmith/customize/hair/hair_base_11_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_11_TRUred.png
	img/sprites/spritesmith/customize/hair/hair_base_12_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_12_TRUred.png
	img/sprites/spritesmith/customize/hair/hair_base_13_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_13_TRUred.png
	img/sprites/spritesmith/customize/hair/hair_base_14_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_14_TRUred.png
	img/sprites/spritesmith/customize/hair/hair_base_9_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_9_TRUred.png
2015-02-12 13:42:11 -06:00
Blade Barringer
df5ff3d5a1 Downgraded coffeescript module to 1.6 2015-02-12 13:31:21 -06:00
Blade Barringer
557ccc7ec0 Added sprites build to build:prod task 2015-02-09 23:07:28 -06:00
Blade Barringer
45d1fb4c6e Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
Conflicts:
	common/dist/scripts/habitrpg-shared.js
2015-02-09 22:18:22 -06:00
Blade Barringer
c8124f28ed Set it so compiled js and sprites are not ignored 2015-02-09 16:04:25 -06:00