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

Show stats Download patch file Download diff file Expand all files Collapse all files

14314

common/dist/scripts/habitrpg-shared.js vendored

View file

File diff suppressed because it is too large Load diff

2

common/dist/sprites/habitrpg-shared.css vendored

View file

File diff suppressed because one or more lines are too long

4080

common/dist/sprites/spritesmith0.css vendored

View file

File diff suppressed because it is too large Load diff

BIN

common/dist/sprites/spritesmith0.png vendored

View file

Binary file not shown.

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

4428

common/dist/sprites/spritesmith1.css vendored

View file

File diff suppressed because it is too large Load diff

BIN

common/dist/sprites/spritesmith1.png vendored

View file

Binary file not shown.

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

2718

common/dist/sprites/spritesmith2.css vendored

View file

File diff suppressed because it is too large Load diff

BIN

common/dist/sprites/spritesmith2.png vendored

View file

Binary file not shown.

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

2226

common/dist/sprites/spritesmith3.css vendored

View file

File diff suppressed because it is too large Load diff

BIN

common/dist/sprites/spritesmith3.png vendored

View file

Binary file not shown.

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

2214

common/dist/sprites/spritesmith4.css vendored

View file

File diff suppressed because it is too large Load diff

BIN

common/dist/sprites/spritesmith4.png vendored

View file

Binary file not shown.

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

2214

common/dist/sprites/spritesmith5.css vendored

View file

File diff suppressed because it is too large Load diff

BIN

common/dist/sprites/spritesmith5.png vendored

View file

Binary file not shown.

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

0

common/img/bs-docs-masthead-pattern.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/calendar_google.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/calendar_ical.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/+1.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/-1.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/100.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/1234.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/8ball.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/a.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/ab.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/abc.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/abcd.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/accept.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/aerial_tramway.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/airplane.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/alarm_clock.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/alien.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/ambulance.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/anchor.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/angel.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/anger.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/angry.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/anguished.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/ant.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/apple.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/aquarius.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/aries.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/arrow_backward.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/arrow_double_down.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/arrow_double_up.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/arrow_down.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/arrow_down_small.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/arrow_forward.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/arrow_heading_down.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/arrow_heading_up.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/arrow_left.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/arrow_lower_left.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/arrow_lower_right.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/arrow_right.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/arrow_right_hook.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/arrow_up.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/arrow_up_down.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/arrow_up_small.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/arrow_upper_left.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/arrow_upper_right.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/arrows_clockwise.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/arrows_counterclockwise.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/art.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/articulated_lorry.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/astonished.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/athletic_shoe.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/atm.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/b.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/baby.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/baby_bottle.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/baby_chick.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/baby_symbol.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/back.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/baggage_claim.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/balloon.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/ballot_box_with_check.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/bamboo.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/banana.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/bangbang.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/bank.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/bar_chart.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/barber.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/baseball.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/basketball.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/bath.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/bathtub.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/battery.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/bear.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/bee.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/beer.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/beers.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/beetle.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/beginner.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/bell.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/bento.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/bicyclist.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/bike.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/bikini.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/bird.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/birthday.png Executable file → Normal file

Unescape Escape View file

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

0

common/img/emoji/black_circle.png Executable file → Normal file

Unescape Escape View file

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