Commit graph

10550 commits

Author SHA1 Message Date
Blade Barringer
4af1a4d6ac Rename image rendering class 2015-08-28 21:48:42 -05:00
Blade Barringer
dd1e69b9d5 Merge branch 'RossBrunton-develop' into develop 2015-08-28 21:42:16 -05:00
Blade Barringer
df3c498fcc Add rasterize class 2015-08-28 21:41:53 -05:00
Sabe Jones
3ad95e1ab7 fix(tutorial): Unstick Justin head
Fixes #5497.
2015-08-28 16:12:45 -04:00
Sabe Jones
6ecf3a0e50 Merge pull request #5851 from HabitRPG/sabrecat/onboarding-tweaks
Sabrecat/onboarding tweaks
2015-08-28 13:50:42 -05:00
Sabe Jones
9e45017faa Merge branch 'develop' into sabrecat/onboarding-tweaks
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-08-28 13:24:10 -05:00
Sabe Jones
8d713a53c4 feat(tutorial): Splash screen overhaul complete 2015-08-28 13:58:30 -04:00
Sabe Jones
f308116c54 feat(tutorial): Moar avatars 2015-08-28 11:48:30 -05:00
Sabe Jones
f88c536836 chore(news): Back to School Bailey 2015-08-27 16:20:15 -05:00
Sabe Jones
f5c08c4ae5 WIP(tutorial): Gregarious Vice 2015-08-27 15:36:53 -05:00
Sabe Jones
f8994a3ee3 WIP(tutorial): Revised images 2015-08-27 15:21:09 -05:00
Sabe Jones
c4012ad762 WIP(tutorial): New intro splash 2015-08-27 16:04:59 -04:00
Ross Brunton
821d562998 Set image-rendering to pixelated
Closes #5846

I explictly disabled it on img because most things that use the img tag
tend not to be pixel art.
2015-08-27 19:17:42 +01:00
Sabe Jones
5c4ebef0a9 feat(tutorial): New intro images 2015-08-27 13:08:12 -05:00
Alys
049f9280a2 Merge pull request #5798 from Alys/rebirth-keeps-free-gear-2015-08-12
prevent Orb of Rebirth from removing free gear (equipment that has zero gold cost) - partial fix for https://github.com/HabitRPG/habitrpg/issues/5750
2015-08-26 22:01:29 +10:00
Sabe Jones
2a8529012b feat(tutorial): GP and EXP awards 2015-08-25 17:09:51 -04:00
Sabe Jones
0c0525640c Merge branch 'develop' into sabrecat/onboarding-tweaks 2015-08-25 16:47:46 -04:00
Sabe Jones
6564cb52dc fix(news): wording tweak 2015-08-25 13:10:33 -04:00
Alys
bbcb9e6063 fix problem of Cheetah Costume Set mystery items not staying put -- code is ugly, improve later 2015-08-25 19:23:25 +10:00
Sabe Jones
9ed1e2ba6d fix(mystery): Force coffee compile 2015-08-24 23:37:54 -05:00
Sabe Jones
d70aa46ec1 fix(mystery): Adjust date range 2015-08-24 21:33:02 -05:00
Sabe Jones
99a9647c46 Merge pull request #5837 from HabitRPG/sabrecat/august-mystery
August Mystery Items
2015-08-24 16:29:09 -05:00
Sabe Jones
c23312f771 feat(mystery): 2015 August items 2015-08-24 17:19:12 -04:00
Sabe Jones
a0e1d50bd6 feat(mystery): 2015 August sprites 2015-08-24 15:38:09 -05:00
Sabe Jones
23259cd456 WIP(tutorial): Award GP and XP 2015-08-24 16:02:25 -04:00
Alys
3d47f3f835 remove "as if you had created a new account" from Orb of Rebirth description 2015-08-23 17:43:33 +10:00
Blade Barringer
8b75de56b6 Correct tabbing on server side specs reporting 2015-08-22 21:41:13 -05:00
Blade Barringer
a07d0cde85 Fixed karma reporting 2015-08-22 21:41:13 -05:00
Blade Barringer
37859e51b7 Move gulp task 2015-08-22 21:41:13 -05:00
Blade Barringer
f4bc208226 Reorganize karma.conf 2015-08-22 21:41:13 -05:00
Blade Barringer
9fde84f3d0 Remove directive 2015-08-22 21:41:12 -05:00
Blade Barringer
7a43e7f90a Remove mocks 2015-08-22 21:41:12 -05:00
Blade Barringer
7a9cbe2cc5 Glob files in karma.conf 2015-08-22 21:41:12 -05:00
Alys
5b8c161932 changed habitrpg.wikia.com to habitica.wikia.com 2015-08-23 12:31:10 +10:00
Alys
fd446fc5e5 convert habitica.com to BASE_URL 2015-08-23 12:23:35 +10:00
Blade Barringer
a4627be3ea Merge branch '3onyc-fix-hash-leak' into develop 2015-08-22 17:54:42 -05:00
Blade Barringer
b2c4d5c012 Add test for items that are deleted when getting the user 2015-08-22 17:53:49 -05:00
Blade Barringer
8fc69102aa Merge branch 'develop' into 3onyc-fix-hash-leak 2015-08-22 17:45:47 -05:00
Blade Barringer
87c04e885d Merge pull request #5818 from lacrimae/patch-6
Wording: Proper English it was not
2015-08-22 17:44:35 -05:00
Blade Barringer
9ddf5353d1 Clean up directive tests 2015-08-22 17:21:30 -05:00
Blade Barringer
b41b629e93 Remove test variable 2015-08-22 17:08:28 -05:00
Blade Barringer
01d122ad67 Remove unneded declaration 2015-08-22 17:04:46 -05:00
Blade Barringer
9643b6e650 Merge branch 'develop' into TheHollidayInn-menu-hide-when-navigate-away 2015-08-22 17:03:26 -05:00
Blade Barringer
6b7ca3e823 Use $scope instead of scope in directives 2015-08-22 17:02:32 -05:00
TheHollidayInn
5e510aade0 Added tests for new menu directives 2015-08-22 15:25:51 -05:00
Alys
f9a0e494a7 changed "The Dreadful Cheetah" to "Such a Cheetah" 2015-08-21 20:49:58 +10:00
lacrimae
b8bd87eeb8 Wording: Proper English it was not 2015-08-20 16:55:05 +02:00
Alys
28e360d7f4 change Janet Janet Mongilio to janetmango 2015-08-20 11:23:29 +10:00
Blade Barringer
0f5f80f910 Unpend preening test 2015-08-19 19:23:23 -05:00
Sabe Jones
f306ee6d1d fix(test): Skip preen test 2015-08-19 20:08:39 -04:00