Merge branch 'common-convert' of github.com:HabitRPG/habitrpg into common-convert

Browse Source

...

This commit is contained in:

Blade Barringer

2015-02-12 13:44:50 -06:00

parent 477d3d6085 4764d6d416

commit ba473598fa

4305 changed files with 7791 additions and 25382 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

common/dist/scripts/habitrpg-shared.js

Vendored

+7176 -7138

File diff suppressed because it is too large Load Diff

common/dist/sprites/habitrpg-shared.css

Vendored

+1 -1

File diff suppressed because one or more lines are too long

common/dist/sprites/spritesmith0.css

Vendored

-4080

File diff suppressed because it is too large Load Diff

common/dist/sprites/spritesmith0.png

Vendored

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 222 KiB

common/dist/sprites/spritesmith1.css

Vendored

-4428

File diff suppressed because it is too large Load Diff

common/dist/sprites/spritesmith1.png

Vendored

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 76 KiB

common/dist/sprites/spritesmith2.css

Vendored

-2718

File diff suppressed because it is too large Load Diff

common/dist/sprites/spritesmith2.png

Vendored

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 184 KiB

common/dist/sprites/spritesmith3.css

Vendored

-2226

File diff suppressed because it is too large Load Diff

common/dist/sprites/spritesmith3.png

Vendored

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 470 KiB

common/dist/sprites/spritesmith4.css

Vendored

-2214

File diff suppressed because it is too large Load Diff

common/dist/sprites/spritesmith4.png

Vendored

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 320 KiB

common/dist/sprites/spritesmith5.css

Vendored

-2214

File diff suppressed because it is too large Load Diff

common/dist/sprites/spritesmith5.png

Vendored

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 279 KiB

common/img/bs-docs-masthead-pattern.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.3 KiB After Width:  |  Height:  |  Size: 6.3 KiB

common/img/calendar_google.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 387 B After Width:  |  Height:  |  Size: 387 B

common/img/calendar_ical.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 729 B After Width:  |  Height:  |  Size: 729 B

common/img/emoji/+1.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.0 KiB After Width:  |  Height:  |  Size: 5.0 KiB

common/img/emoji/-1.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.0 KiB After Width:  |  Height:  |  Size: 5.0 KiB

common/img/emoji/100.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.2 KiB After Width:  |  Height:  |  Size: 3.2 KiB

common/img/emoji/1234.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.6 KiB After Width:  |  Height:  |  Size: 4.6 KiB

common/img/emoji/8ball.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.0 KiB After Width:  |  Height:  |  Size: 4.0 KiB

common/img/emoji/a.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.1 KiB After Width:  |  Height:  |  Size: 3.1 KiB

common/img/emoji/ab.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.8 KiB After Width:  |  Height:  |  Size: 3.8 KiB

common/img/emoji/abc.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.1 KiB After Width:  |  Height:  |  Size: 4.1 KiB

common/img/emoji/abcd.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.4 KiB After Width:  |  Height:  |  Size: 4.4 KiB

common/img/emoji/accept.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.6 KiB After Width:  |  Height:  |  Size: 4.6 KiB

common/img/emoji/aerial_tramway.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.4 KiB After Width:  |  Height:  |  Size: 3.4 KiB

common/img/emoji/airplane.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.6 KiB After Width:  |  Height:  |  Size: 4.6 KiB

common/img/emoji/alarm_clock.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.9 KiB After Width:  |  Height:  |  Size: 6.9 KiB

common/img/emoji/alien.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.3 KiB After Width:  |  Height:  |  Size: 5.3 KiB

common/img/emoji/ambulance.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.6 KiB After Width:  |  Height:  |  Size: 3.6 KiB

common/img/emoji/anchor.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.4 KiB After Width:  |  Height:  |  Size: 4.4 KiB

common/img/emoji/angel.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.5 KiB After Width:  |  Height:  |  Size: 6.5 KiB

common/img/emoji/anger.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.0 KiB After Width:  |  Height:  |  Size: 3.0 KiB

common/img/emoji/angry.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.0 KiB After Width:  |  Height:  |  Size: 5.0 KiB

common/img/emoji/anguished.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 7.7 KiB After Width:  |  Height:  |  Size: 7.7 KiB

common/img/emoji/ant.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.8 KiB After Width:  |  Height:  |  Size: 2.8 KiB

common/img/emoji/apple.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.5 KiB After Width:  |  Height:  |  Size: 5.5 KiB

common/img/emoji/aquarius.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.0 KiB After Width:  |  Height:  |  Size: 5.0 KiB

common/img/emoji/aries.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.3 KiB After Width:  |  Height:  |  Size: 4.3 KiB

common/img/emoji/arrow_backward.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.1 KiB After Width:  |  Height:  |  Size: 3.1 KiB

common/img/emoji/arrow_double_down.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.1 KiB After Width:  |  Height:  |  Size: 3.1 KiB

common/img/emoji/arrow_double_up.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.5 KiB After Width:  |  Height:  |  Size: 3.5 KiB

common/img/emoji/arrow_down.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.0 KiB After Width:  |  Height:  |  Size: 3.0 KiB

common/img/emoji/arrow_down_small.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.9 KiB After Width:  |  Height:  |  Size: 2.9 KiB

common/img/emoji/arrow_forward.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.1 KiB After Width:  |  Height:  |  Size: 3.1 KiB

common/img/emoji/arrow_heading_down.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.4 KiB After Width:  |  Height:  |  Size: 3.4 KiB

common/img/emoji/arrow_heading_up.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.4 KiB After Width:  |  Height:  |  Size: 3.4 KiB

common/img/emoji/arrow_left.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.0 KiB After Width:  |  Height:  |  Size: 3.0 KiB

common/img/emoji/arrow_lower_left.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.3 KiB After Width:  |  Height:  |  Size: 3.3 KiB

common/img/emoji/arrow_lower_right.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.3 KiB After Width:  |  Height:  |  Size: 3.3 KiB

common/img/emoji/arrow_right.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.0 KiB After Width:  |  Height:  |  Size: 3.0 KiB

common/img/emoji/arrow_right_hook.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.6 KiB After Width:  |  Height:  |  Size: 3.6 KiB

common/img/emoji/arrow_up.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.0 KiB After Width:  |  Height:  |  Size: 3.0 KiB

common/img/emoji/arrow_up_down.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.5 KiB After Width:  |  Height:  |  Size: 3.5 KiB

common/img/emoji/arrow_up_small.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.1 KiB After Width:  |  Height:  |  Size: 3.1 KiB

common/img/emoji/arrow_upper_left.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.2 KiB After Width:  |  Height:  |  Size: 3.2 KiB

common/img/emoji/arrow_upper_right.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.2 KiB After Width:  |  Height:  |  Size: 3.2 KiB

common/img/emoji/arrows_clockwise.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.4 KiB After Width:  |  Height:  |  Size: 1.4 KiB

common/img/emoji/arrows_counterclockwise.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.7 KiB After Width:  |  Height:  |  Size: 4.7 KiB

common/img/emoji/art.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.6 KiB After Width:  |  Height:  |  Size: 6.6 KiB

common/img/emoji/articulated_lorry.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.9 KiB After Width:  |  Height:  |  Size: 2.9 KiB

common/img/emoji/astonished.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.9 KiB After Width:  |  Height:  |  Size: 5.9 KiB

common/img/emoji/athletic_shoe.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.7 KiB After Width:  |  Height:  |  Size: 4.7 KiB

common/img/emoji/atm.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.0 KiB After Width:  |  Height:  |  Size: 4.0 KiB

common/img/emoji/b.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.0 KiB After Width:  |  Height:  |  Size: 3.0 KiB

common/img/emoji/baby.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.8 KiB After Width:  |  Height:  |  Size: 5.8 KiB

common/img/emoji/baby_bottle.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.4 KiB After Width:  |  Height:  |  Size: 4.4 KiB

common/img/emoji/baby_chick.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.9 KiB After Width:  |  Height:  |  Size: 3.9 KiB

common/img/emoji/baby_symbol.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.9 KiB After Width:  |  Height:  |  Size: 2.9 KiB

common/img/emoji/back.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.3 KiB After Width:  |  Height:  |  Size: 5.3 KiB

common/img/emoji/baggage_claim.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.4 KiB After Width:  |  Height:  |  Size: 3.4 KiB

common/img/emoji/balloon.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.4 KiB After Width:  |  Height:  |  Size: 2.4 KiB

common/img/emoji/ballot_box_with_check.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.8 KiB After Width:  |  Height:  |  Size: 1.8 KiB

common/img/emoji/bamboo.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.6 KiB After Width:  |  Height:  |  Size: 4.6 KiB

common/img/emoji/banana.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.8 KiB After Width:  |  Height:  |  Size: 3.8 KiB

common/img/emoji/bangbang.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.4 KiB After Width:  |  Height:  |  Size: 1.4 KiB

common/img/emoji/bank.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.5 KiB After Width:  |  Height:  |  Size: 5.5 KiB

common/img/emoji/bar_chart.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.4 KiB After Width:  |  Height:  |  Size: 2.4 KiB

common/img/emoji/barber.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.2 KiB After Width:  |  Height:  |  Size: 4.2 KiB

common/img/emoji/baseball.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.9 KiB After Width:  |  Height:  |  Size: 5.9 KiB

common/img/emoji/basketball.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.2 KiB After Width:  |  Height:  |  Size: 6.2 KiB

common/img/emoji/bath.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.1 KiB After Width:  |  Height:  |  Size: 3.1 KiB

common/img/emoji/bathtub.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.7 KiB After Width:  |  Height:  |  Size: 2.7 KiB

common/img/emoji/battery.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.7 KiB After Width:  |  Height:  |  Size: 3.7 KiB

common/img/emoji/bear.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.4 KiB After Width:  |  Height:  |  Size: 5.4 KiB

common/img/emoji/bee.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.7 KiB After Width:  |  Height:  |  Size: 5.7 KiB

common/img/emoji/beer.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.0 KiB After Width:  |  Height:  |  Size: 6.0 KiB

common/img/emoji/beers.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.4 KiB After Width:  |  Height:  |  Size: 6.4 KiB

common/img/emoji/beetle.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.1 KiB After Width:  |  Height:  |  Size: 5.1 KiB

common/img/emoji/beginner.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.7 KiB After Width:  |  Height:  |  Size: 2.7 KiB

common/img/emoji/bell.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.7 KiB After Width:  |  Height:  |  Size: 4.7 KiB

common/img/emoji/bento.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.6 KiB After Width:  |  Height:  |  Size: 5.6 KiB

common/img/emoji/bicyclist.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.3 KiB After Width:  |  Height:  |  Size: 6.3 KiB

common/img/emoji/bike.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.6 KiB After Width:  |  Height:  |  Size: 4.6 KiB

common/img/emoji/bikini.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.8 KiB After Width:  |  Height:  |  Size: 3.8 KiB

common/img/emoji/bird.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.8 KiB After Width:  |  Height:  |  Size: 4.8 KiB

common/img/emoji/birthday.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.3 KiB After Width:  |  Height:  |  Size: 5.3 KiB

common/img/emoji/black_circle.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.3 KiB After Width:  |  Height:  |  Size: 2.3 KiB

Some files were not shown because too many files have changed in this diff Show More