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

..

emoji

adding emoji images

2013-11-27 10:23:04 -08:00

logo

add a bunch of possible shared items for now, will clean up later

2013-03-11 14:50:00 -04:00

npcs

fix #1937 (missing justin npc) @SabreCat

2013-11-27 18:56:03 -07:00

project_files

classes WIP

2013-11-21 10:15:44 -08:00

sprites

Merge branch 'master' into classes

2013-12-01 19:24:40 -07:00

unprocessed

small tweaks to user._tmp, and fixing my own icon

2013-09-02 17:35:00 -04:00

bs-docs-masthead-pattern.png

update images. move from main site here, wont' be maintaining on main

2013-08-26 19:42:41 -04:00

calendar_google.png

add a bunch of possible shared items for now, will clean up later

2013-03-11 14:50:00 -04:00

calendar_ical.png

add a bunch of possible shared items for now, will clean up later

2013-03-11 14:50:00 -04:00

coin_single_gold.png

add a bunch of possible shared items for now, will clean up later

2013-03-11 14:50:00 -04:00

coin_single_silver.png

add a bunch of possible shared items for now, will clean up later

2013-03-11 14:50:00 -04:00

facebook-login-register.jpeg

add a bunch of possible shared items for now, will clean up later

2013-03-11 14:50:00 -04:00

glyphicons-halflings-white.png

add a bunch of possible shared items for now, will clean up later

2013-03-11 14:50:00 -04:00

glyphicons-halflings.png

add a bunch of possible shared items for now, will clean up later

2013-03-11 14:50:00 -04:00

PixelPaw002.png

update images. move from main site here, wont' be maintaining on main

2013-08-26 19:42:41 -04:00

PixelPaw-Gold.png

Add golden paw graphic for missing but obtainable rare pets.

2013-10-30 21:20:20 -07:00

PixelPaw.png

update images. move from main site here, wont' be maintaining on main

2013-08-26 19:42:41 -04:00

play_screenshot.jpeg

add a bunch of possible shared items for now, will clean up later

2013-03-11 14:50:00 -04:00

screenshot.jpeg

add a bunch of possible shared items for now, will clean up later

2013-03-11 14:50:00 -04:00