Commit graph

50 commits

Author SHA1 Message Date
Tyler Renelle
7147287164 chore(Merge): remote-tracking branch 'PeterHatch/develop' into develop
Conflicts:
	dist/customizer.css
	dist/habitrpg-shared.css
	dist/habitrpg-shared.js
	dist/spritesmith.css
	dist/spritesmith.png
2014-03-21 20:07:19 -06:00
Tyler Renelle
50132f1a35 feat(equipment): remove base gear from equipment tabs. now clicking the
same gear you have equipped will un-equip it
2014-03-21 15:06:26 -06:00
Tyler Renelle
6c2b45ff01 feat(spring): spring fling event class gear. Also! moving tons of folders around for better organizationfeat(spring): spring event class gear. Also! moving tons of spritesmith folders around for better organization 2014-03-21 14:53:30 -06:00
Tyler Renelle
7b8e0dc0a4 feat(march): replace npcs with march versions (revert here when done) 2014-03-21 12:31:47 -06:00
Tyler Renelle
e53ef26d4c feat(flower): add flower customization option 2014-03-21 12:30:36 -06:00
Peter Hatch
e373ccba35 Aligned Nunchaku's transparent pixel with the character's hand. 2014-03-20 13:08:59 -07:00
Tyler Renelle
bede329d11 feat(mystery): add mystery items to spritesmith, so 3rd parties can use them too. 2014-03-08 21:14:20 -07:00
Tyler Renelle
a741b744b1 fix(hedgehogs): flip sprites, expand template to 81x99, position down &
left. Fixes https://github.com/HabitRPG/habitrpg/issues/3000
2014-03-07 14:57:58 -07:00
Tyler Renelle
4010bb950c fix(spritesmith): add padding between sprites to avoid stray-pixels
issue, fixes https://github.com/HabitRPG/habitrpg/issues/2938
2014-02-28 10:23:45 -08:00
Tyler Renelle
1223294267 fix(spritesmith): add background-size property to all sprites. Fixes https://github.com/HabitRPG/habitrpg/issues/2510 , see https://github.com/Ensighten/grunt-spritesmith/issues/67 2014-02-28 10:19:04 -08:00
Tyler Renelle
29f6f8e140 feat(quests): add hedgehog sprites 2014-02-27 18:32:04 -08:00
Tyler Renelle
335d063512 chore(grunt): revert f3c5d3f73a and
fb63ae25f0 . Was causing broken
customizer.css, fixes https://github.com/HabitRPG/habitrpg/issues/2934
. cc @paglias
2014-02-22 22:44:33 -08:00
Matteo Pagliazzi
fb63ae25f0 fix(css spritesheet): prevent duplication of css in customizer.css 2014-02-22 16:26:15 +01:00
Tyler Renelle
b03c377294 feat(valentine): remove valentine event 2014-02-18 11:20:31 -07:00
Tyler Renelle
07eef7c723 chore(grunt): bailey valentine 2014-02-13 23:29:55 -07:00
Tyler Renelle
608b829d7e feat(valentine): valentine event 2014-02-13 18:20:12 -07:00
Matteo Pagliazzi
cddf513359 refactor(grunt): spritesmith cached on server, do not add timestamp to name, remove unused coins icons 2014-02-12 15:11:45 +01:00
Matteo Pagliazzi
8170ac746f chore(i18n): prepare english for transifex: remove ending or starting space & _comment strings 2014-02-11 19:30:35 +01:00
Tyler Renelle
7ace7b49b1 fix(critical-hammer): add 40x40 shop icon 2014-02-07 12:31:58 -07:00
Tyler Renelle
63f691b00d feat(premium): add mystery-item present box. Doesn't do anything yet,
will add logic later this month
2014-02-07 10:53:08 -07:00
Tyler Renelle
619d254cc0 feat(rainbow-hair): add rainbow hair colors 2014-02-07 09:45:10 -07:00
Tyler Renelle
64fa6d9a53 feat(npcs): return npcs back to normal (incl npc_ian as a gif) 2014-01-31 15:45:38 -07:00
Tyler Renelle
39285e2d0b feat(quests): Vice quest 2014-01-31 14:50:24 -07:00
Tyler Renelle
949386f44f feat(habitBirthday): add habitrpg birthday event. includes cakes for all
pets, absurd party robes, npc swap, badge, etc. @lemoness
2014-01-30 19:19:30 -07:00
Matteo Pagliazzi
47da2b4406 i18n(merge): merge @Sinza- changes & rebuild 2014-01-30 22:00:20 +01:00
Sabe Jones
9d2e00f408 fix(mounts): Correct one more bungle on Skeleton Gryphon
OK, I lied. I accidentally killed a pixel on the Skeleton Gryphon's wing, so I've put that back and attached it in a way that looks good. Now! Done! Until I do some entirely unrelated mount sprite tinkering. :P
2014-01-26 20:13:49 -08:00
Sabe Jones
6a0f48540d fix(mounts): Reposition gryphons, one more time
Third time's the charm. This version uses a 5x, 3y offset, preserving the wingtip. I've also moved the skeleton gryphon's wing so it emerges from the shoulder similar to the fleshy gryphons' wings, no longer obscuring the avatar's face. Now I'm done for reals; more expert pixelists can tweak from here ^.^;
2014-01-26 19:55:41 -08:00
Sabe Jones
f1bbd92ceb fix(mounts): Relocate wing to head layer
Implements @baconsaur's revised placement of wings for Gryphon mounts. Avatars now sit behind the wing, which protrudes from the Gryphon's shoulder facing the player. There are further fixes to be done, but this should get us closer to the artist's original vision.
2014-01-26 10:20:39 -08:00
Tyler Renelle
2ee93763fc feat(quests): add the gryphon quest, mount, pet, egg. For the glory of @baconsaur! 2014-01-21 14:41:07 -08:00
Tyler Renelle
965e57ed2f chore(grunt): grunt with @sabrecat's mount=>spritesmith, + my multi-drops 2014-01-21 13:32:46 -08:00
Tyler Renelle
cb7e654c48 refactor(sprites): grunt spritesmith for @sabrecat's e44c84bef9 2014-01-19 17:48:06 -08:00
Tyler Renelle
8df7fe65c5 feat(perfect-day achievement) here's one for the road @wc8 @sabrecat, if
you perform a perfect day of dailies, you get an achievement PLUS lvl/2
buff to all stats for the next day
2014-01-15 16:26:47 -07:00
Tyler Renelle
0157afb6b3 spritesmith: try using spritesmith-{TIMESTAMP}.png for image
cache-busting (@paglias good idea)
2014-01-06 22:57:35 -07:00
Tyler Renelle
4b16317c15 winter: add winter-specific class gear as event-timed specials (@lemoness) 2014-01-06 17:14:17 -07:00
Tyler Renelle
93201b5d39 back to normal winter npc sprites 2014-01-02 16:35:49 -07:00
Tyler Renelle
549fd7bac0 new year's eve event: party hat, new NPCs 2013-12-31 08:44:01 -07:00
Tyler Renelle
19f53c3675 Merge remote-tracking branch 'origin/sabe/rebirth' into develop
Conflicts:
	dist/customizer.css
	dist/habitrpg-shared.css
	dist/spritesmith.css
	dist/spritesmith.png
2013-12-31 07:56:35 -07:00
Tyler Renelle
bafa3ffd21 winter: add snowball achievement 2013-12-27 09:48:35 -07:00
Tyler Renelle
9aeb4f9ffb quests: add collection quests & quest arks 2013-12-24 17:24:32 -07:00
Tyler Renelle
883abf34dd rebirth: grunt (@sabrecat) 2013-12-23 18:59:41 -07:00
Tyler Renelle
7f3337c1b9 Quests: Initial bosses WIP, change all content.*.name to content.*.key for consistency (and to make room for quest.name). Bugfix on STR adjustment 2013-12-22 22:20:44 -07:00
Tyler Renelle
040ae343b4 add npc_tyler for tech updates 2013-12-21 15:05:12 -07:00
Tyler Renelle
3965194a07 add salt spell to remove snowman effect 2013-12-20 18:34:14 -07:00
Tyler Renelle
5b92fa0f40 rename head_special_winter to head_special_candycane 2013-12-20 11:03:16 -07:00
Tyler Renelle
b9f2599f9c winter event! npcs, snowball=>snowman, new hairs/beards 2013-12-20 10:21:24 -07:00
Tyler Renelle
41c2218976 [https://github.com/HabitRPG/habitrpg/issues/1994] fix TigerCub not appearing 2013-12-16 15:37:58 -07:00
Tyler Renelle
63765ec013 classes: rogue tree = knife*4 > chuck > katana > hook. alas that we were
pressed for time, we can revisit later. Edit starter rogue details for
content.coffee
2013-12-14 23:42:31 -07:00
Tyler Renelle
f939ca7d8e customizations: rename skins for more political correctness (see https://trello.com/c/YKXmHNjY/306-customization-redo) 2013-12-14 15:29:30 -07:00
Tyler Renelle
adc7b7f6a6 [https://github.com/HabitRPG/habitrpg/pull/1969] move armor_base_0_* to
shirt_*, special handling under user.preferences.shirt. Removed
stray pixels to bottom left.
2013-12-14 00:27:19 -07:00
Tyler Renelle
bf52efa2ca classes: add a second grunt-spritesmith pass which creates
.customize-options.SPRITE_NAME to resize buttons as 60x60 & reposition
the sprite. This seems pretty dirty because the images are parsed twice,
@paglias let me know if you think there's a better way
2013-12-13 21:48:23 -07:00