Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
3f874e25a4bbba173e7d8ee02416e194875cc2d2
habitica/common/img/sprites/spritesmith/misc
T
History
Sabe Jones 0f31873262 Merge branch 'develop' into sabrecat/party-page 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith1.css
	common/dist/sprites/spritesmith1.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png
	website/views/options/social/index.jade
2015-08-14 11:23:35 -05:00
..
avatar_floral_healer.png
fix(seasonal): NO FLOWERS
2015-04-01 23:07:36 -05:00
avatar_floral_rogue.png
fix(seasonal): NO FLOWERS
2015-04-01 23:07:36 -05:00
avatar_floral_warrior.png
fix(seasonal): NO FLOWERS
2015-04-01 23:07:36 -05:00
avatar_floral_wizard.png
fix(seasonal): NO FLOWERS
2015-04-01 23:07:36 -05:00
GrimReaper.png
Mv images to correct place
2015-02-12 13:44:28 -06:00
inventory_present_01.png
feat(mystery): Programmatic presents
2015-06-01 12:06:35 -05:00
inventory_present_02.png
feat(mystery): Programmatic presents
2015-06-01 12:06:35 -05:00
inventory_present_03.png
feat(mystery): Programmatic presents
2015-06-01 12:06:35 -05:00
inventory_present_04.png
feat(mystery): Programmatic presents
2015-06-01 12:06:35 -05:00
inventory_present_05.png
feat(mystery): Programmatic presents
2015-06-01 12:06:35 -05:00
inventory_present_06.png
feat(mystery): Programmatic presents
2015-06-01 12:06:35 -05:00
inventory_present_07.png
feat(mystery): Programmatic presents
2015-06-01 12:06:35 -05:00
inventory_present_08.png
feat(mystery): Programmatic presents
2015-06-01 12:06:35 -05:00
inventory_present_09.png
feat(mystery): Programmatic presents
2015-06-01 12:06:35 -05:00
inventory_present_10.png
feat(mystery): Programmatic presents
2015-06-01 12:06:35 -05:00
inventory_present_11.png
feat(mystery): Programmatic presents
2015-06-01 12:06:35 -05:00
inventory_present_12.png
feat(mystery): Programmatic presents
2015-06-01 12:06:35 -05:00
inventory_present.png
feat(flowers): AND SLIMES
2015-03-31 18:41:50 -05:00
inventory_quest_scroll_locked.png
Mv images to correct place
2015-02-12 13:44:28 -06:00
inventory_quest_scroll.png
Mv images to correct place
2015-02-12 13:44:28 -06:00
inventory_special_fortify.png
Updated fotify potion art
2015-04-09 09:15:32 -05:00
inventory_special_greeting.png
WIP(greeting-cards): Abandon spell refactor
2015-08-13 14:31:34 -05:00
inventory_special_nye.png
Mv images to correct place
2015-02-12 13:44:28 -06:00
inventory_special_opaquePotion.png
Mv images to correct place
2015-02-12 13:44:28 -06:00
inventory_special_seafoam.png
feat(event): Summer Splash cont'd
2015-07-01 13:11:53 -05:00
inventory_special_shinySeed.png
fix(seasonal): NO FLOWERS
2015-04-01 23:07:36 -05:00
inventory_special_snowball.png
Mv images to correct place
2015-02-12 13:44:28 -06:00
inventory_special_spookDust.png
Mv images to correct place
2015-02-12 13:44:28 -06:00
inventory_special_thankyou.png
WIP(greeting-cards): Abandon spell refactor
2015-08-13 14:31:34 -05:00
inventory_special_trinket.png
Mv images to correct place
2015-02-12 13:44:28 -06:00
inventory_special_valentine.png
Mv images to correct place
2015-02-12 13:44:28 -06:00
knockout.png
feat(death): Release candidate
2015-07-24 16:24:14 -05:00
party_preview.png
WIP(party-page): Party preview graphic
2015-08-06 16:36:28 -05:00
Pet_Currency_Gem1x.png
Mv images to correct place
2015-02-12 13:44:28 -06:00
Pet_Currency_Gem2x.png
Mv images to correct place
2015-02-12 13:44:28 -06:00
Pet_Currency_Gem.png
Mv images to correct place
2015-02-12 13:44:28 -06:00
pet_key.png
Mv images to correct place
2015-02-12 13:44:28 -06:00
PixelPaw002.png
Mv images to correct place
2015-02-12 13:44:28 -06:00
PixelPaw-Gold.png
Mv images to correct place
2015-02-12 13:44:28 -06:00
PixelPaw.png
Mv images to correct place
2015-02-12 13:44:28 -06:00
rebirth_orb.png
Mv images to correct place
2015-02-12 13:44:28 -06:00
seafoam_star.png
feat(event): Summer Splash cont'd
2015-07-01 13:11:53 -05:00
shop_armoire.png
fix(visuals): Armoire and Seasonal Shop
2015-07-28 13:35:17 -05:00
snowman.png
Mv images to correct place
2015-02-12 13:44:28 -06:00
spookman.png
Mv images to correct place
2015-02-12 13:44:28 -06:00
welcome_to_Habit_1.png
feat(tour): Revised intro tutorial
2015-05-29 14:03:42 -05:00
welcome_to_Habit_2.png
feat(tour): Revised intro tutorial
2015-05-29 14:03:42 -05:00
welcome_to_Habit_3.png
feat(tour): Iteration 5/29
2015-05-29 15:14:19 -05:00
welcome_to_Habit_4.png
feat(tour): Revised intro tutorial
2015-05-29 14:03:42 -05:00
zzz_light.png
Mv images to correct place
2015-02-12 13:44:28 -06:00
zzz.png
Mv images to correct place
2015-02-12 13:44:28 -06:00