Commit graph

66 commits

Author SHA1 Message Date
Blade Barringer
6b88ad6f2a Merge branch 'resize-pet-dragon-hydra' of https://github.com/bcseda/habitrpg-shared into bcseda-resize-pet-dragon-hydra
Conflicts:
	img/sprites/spritesmith/stable/pets/Pet-Dragon-Hydra.png
2014-12-30 15:01:52 -06:00
Sabe Jones
8d645bcafd chore(grunt): grunt full
Also flips Ian NPC to standard spritesmith instead of animated GIF.
2014-12-21 10:57:02 -06:00
Sabe Jones
a0434e67a6 Revert "fix(style): Pet key margins like sub gems"
This reverts commit d584e998ba.
2014-12-04 20:26:27 -06:00
Sabe Jones
d584e998ba fix(style): Pet key margins like sub gems 2014-12-04 20:14:16 -06:00
Sabe Jones
cc32369497 fix(style): Prettify Market Gem 2014-12-03 22:10:35 -06:00
Tyler Renelle
3fc4978176 feat(fall): back to default npcs 2014-11-02 23:10:48 -07:00
Brandon Seda
85a4fbfeae Resizes pet-dragon-hydra.png
Also removes commented out reference in backer.css
2014-09-20 09:23:42 -04:00
Tyler Renelle
bf7f65e8c8 feat(fall): npc-swap 2014-09-16 17:43:46 -06:00
Tyler Renelle
b3fd859cad chore(npcs): back to normal npcs 2014-08-01 14:07:01 -06:00
Tyler Renelle
ec39634458 fix(spritesmith): split spritesheets in to multiple files to remove the
blurry iOS issue. Fixes
https://github.com/HabitRPG/habitrpg/issues/2510, see
http://goo.gl/IwxdI4 . Note, this commit isn't smart/dynamic, there's
commented-out code for handling dynamic splitting, but I couldn't get it
working - static 4 sheets for now
2014-07-31 15:44:22 -06:00
Tyler Renelle
f939bdcbcb feat(summer): summer event 2014-06-20 15:28:29 -06:00
Tyler Renelle
bedf472ff3 Merge remote-tracking branch 'PeterHatch/single-pass-spritesmith' into develop
Conflicts:
	dist/customizer.css
	dist/habitrpg-shared.css
	dist/spritesmith.css
	dist/spritesmith.png
2014-05-03 21:29:37 -06:00
Tyler Renelle
b304243119 feat(spring): back to normal npcs 2014-04-30 22:17:59 -06:00
Tyler Renelle
692a1f6639 feat(spring): put spring npcs back in (@lemoness) 2014-04-07 15:08:52 -06:00
Tyler Renelle
7b040242bb fix(npcs): put ian.gif back in 2014-04-02 00:10:52 -06:00
Peter Hatch
c9a42ed115 Create spritesmith CSS in a single pass. 2014-03-27 23:00:54 -07:00
Peter Hatch
c098f6a522 Simplified Crystal Sword CSS. 2014-03-27 16:41:42 -07:00
Peter Hatch
28b12c1f0d Fixed alignment of Crystal Sword. 2014-03-27 16:27:06 -07: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
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
Matteo Pagliazzi
6104767711 fix(css): gems alignment and remove unused code 2014-02-08 17:35:43 +01:00
Tyler Renelle
6a5df319ed feat(critical-hammer): add Critical Hammer of Bug-Crushing 2014-02-07 11:48:06 -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
0aa2f44693 chore(css): mounts consolidation 2014-01-21 17:00:32 -08:00
Sabe Jones
cfa386683e refactor(sprites): remove deprecated Mount-SpriteSheet.png and strip down Mounts.css
This commit removes the old mounts spritesheet, and removes all manually created mount CSS from Mounts.css, leaving only the 18px top margin used to position mounts in the herobox.
2014-01-19 22:04:21 -06:00
Tyler Renelle
0285de5098 winter: use npc_ian from holiday-event pngs, disable gif for now (revert this later) 2013-12-31 08:47:10 -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
a46c09f0d1 add fortify as potion on 'special items'. Some inventory css tweaks 2013-12-20 10:13:37 -07:00
Tyler Renelle
31fec0c173 fixes: unlock, task.history, customizations 2013-12-13 22:58:48 -07:00
Tyler Renelle
b5c928238b grunt-spritesmith #37 contributor pet 2013-12-05 15:56:47 -07:00
Tyler Renelle
69d248f826 grunt-spritesmith #37 backer & contrib spritesheets support 2013-12-05 15:46:08 -07:00
Tyler Renelle
417986c6b4 [#37]grunt-spritesmith: shop sprites 2013-12-04 20:01:29 -07:00
Tyler Renelle
3026cc2132 [#37] grunt-spritesmith: achievements 2013-12-04 20:01:14 -07:00
Tyler Renelle
53bbb20ba6 [#37] class: misc cleanup (moving / deletions) 2013-12-04 20:01:04 -07:00
Tyler Renelle
6c927414d1 grunt-spritesmith: eggs, food, hatchingPotions, gems #37 2013-12-03 18:43:08 -07:00
Tyler Renelle
4bbf0cfae8 Merge remote-tracking branch 'Shaners/contrib' into classes
Conflicts:
	img/sprites/Egg_Sprite_Sheet.png
	img/sprites/archive/BackerOnly-Shop-temporary.png
	img/sprites/archive/player_sprites.png
	img/sprites/archive/player_sprites105x.png
2013-12-03 18:16:33 -07:00
Tyler Renelle
5c97887d0d Merge branch 'master' into classes
Conflicts:
	img/sprites/Mount-SpriteSheet.png
2013-12-03 18:10:08 -07:00
Tyler Renelle
0ffc836120 mounts: mounts & food sprites & css 2013-12-03 18:04:51 -07:00
Tyler Renelle
dbd7aaf4c4 classes: spritesmith add pets 2013-12-03 17:58:37 -07:00
Tyler Renelle
c46795e7a5 classes: grunt-spritesmith WIP #37 (working for male sprites now) 2013-12-03 16:32:20 -07:00
Tyler Renelle
f662b3af18 Merge branch 'master' into classes
Conflicts:
	dist/habitrpg-shared.js
	dist/spritesheets.css
	script/items.coffee
2013-12-01 19:24:40 -07:00
Tyler Renelle
73d8e00406 thanksgiving turkey & npcs 2013-11-27 11:58:19 -07:00
Tyler Renelle
1ef6bb18a8 classes WIP 2013-11-21 10:15:44 -08:00
Tyler Renelle
d1cc6a3dd7 mounts: fix spritesheets for rare mounts to work with mount system 2013-11-10 14:36:02 -08:00
Tyler Renelle
fd4e54ef84 mounts: fix up spritesheets mount system 2013-11-10 13:22:44 -08:00
Shaners
344a5302c0 Resizes some assets where possible to fit into 90 avatar box and adjusts CSS accordingly. Fixes some positioning in shop sprite img and css. 2013-11-08 00:06:09 -08:00
Tyler Renelle
54229ee406 contrib: update css to accomodate new contributor only store & equipment (@Shaners could you take a peek at the css positioning issues in backer.css?) 2013-11-07 13:10:41 -08:00
Tyler Renelle
1bfb6a88fd Merge remote-tracking branch 'shaners/rewrite'
Conflicts:
	dist/spritesheets.css
2013-10-29 23:15:03 -07:00
Shane Lister
399604c886 Update backer.css 2013-10-27 19:16:18 -07:00
Shaners
8fed3f5c5a Add contributor-only pet - Hydra 2013-10-26 18:17:44 -07:00