Merge branch 'master' into webrtc

Browse source

# Conflicts:
#	back/src/Model/Websocket/MessageUserPosition.ts

...

This commit is contained in:

gparant 2020-04-29 00:05:16 +02:00

parent 4e556782af 8d784008b8

commit 3151113db3

303 changed files with 12 additions and 6 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

BIN

front/dist/resources/characters/pipoya/Cat 01-1.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.4 KiB

BIN

front/dist/resources/characters/pipoya/Cat 01-2.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.4 KiB

BIN

front/dist/resources/characters/pipoya/Cat 01-3.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.4 KiB

BIN

front/dist/resources/characters/pipoya/Dog 01-1.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.5 KiB

BIN

front/dist/resources/characters/pipoya/Dog 01-2.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.5 KiB

BIN

front/dist/resources/characters/pipoya/Dog 01-3.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.5 KiB

BIN

front/dist/resources/characters/pipoya/Female 01-1.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

front/dist/resources/characters/pipoya/Female 01-2.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

front/dist/resources/characters/pipoya/Female 01-3.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

front/dist/resources/characters/pipoya/Female 01-4.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

front/dist/resources/characters/pipoya/Female 02-1.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

front/dist/resources/characters/pipoya/Female 02-2.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

front/dist/resources/characters/pipoya/Female 02-3.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

front/dist/resources/characters/pipoya/Female 02-4.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

front/dist/resources/characters/pipoya/Female 03-1.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

front/dist/resources/characters/pipoya/Female 03-2.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

front/dist/resources/characters/pipoya/Female 03-3.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

front/dist/resources/characters/pipoya/Female 03-4.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

front/dist/resources/characters/pipoya/Female 04-1.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

front/dist/resources/characters/pipoya/Female 04-2.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

front/dist/resources/characters/pipoya/Female 04-3.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

front/dist/resources/characters/pipoya/Female 04-4.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

front/dist/resources/characters/pipoya/Female 05-1.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

front/dist/resources/characters/pipoya/Female 05-2.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

front/dist/resources/characters/pipoya/Female 05-3.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

front/dist/resources/characters/pipoya/Female 05-4.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

front/dist/resources/characters/pipoya/Female 06-1.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

front/dist/resources/characters/pipoya/Female 06-2.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

front/dist/resources/characters/pipoya/Female 06-3.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

front/dist/resources/characters/pipoya/Female 06-4.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

front/dist/resources/characters/pipoya/Female 07-1.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.5 KiB

BIN

front/dist/resources/characters/pipoya/Female 07-2.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.5 KiB

BIN

front/dist/resources/characters/pipoya/Female 07-3.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.5 KiB

BIN

front/dist/resources/characters/pipoya/Female 07-4.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.5 KiB

BIN

front/dist/resources/characters/pipoya/Female 08-1.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.4 KiB

BIN

front/dist/resources/characters/pipoya/Female 08-2.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.4 KiB

BIN

front/dist/resources/characters/pipoya/Female 08-3.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.4 KiB

BIN

front/dist/resources/characters/pipoya/Female 08-4.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.4 KiB

BIN

front/dist/resources/characters/pipoya/Female 09-1.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

front/dist/resources/characters/pipoya/Female 09-2.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

front/dist/resources/characters/pipoya/Female 09-3.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

front/dist/resources/characters/pipoya/Female 09-4.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

front/dist/resources/characters/pipoya/Female 10-1.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

front/dist/resources/characters/pipoya/Female 10-2.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

front/dist/resources/characters/pipoya/Female 10-3.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

front/dist/resources/characters/pipoya/Female 10-4.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

front/dist/resources/characters/pipoya/Female 11-1.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

front/dist/resources/characters/pipoya/Female 11-2.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

front/dist/resources/characters/pipoya/Female 11-3.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

front/dist/resources/characters/pipoya/Female 11-4.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

front/dist/resources/characters/pipoya/Female 12-1.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

front/dist/resources/characters/pipoya/Female 12-2.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.3 KiB

BIN

front/dist/resources/characters/pipoya/Female 12-3.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

front/dist/resources/characters/pipoya/Female 12-4.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

front/dist/resources/characters/pipoya/Female 13-1.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

front/dist/resources/characters/pipoya/Female 13-2.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

front/dist/resources/characters/pipoya/Female 13-3.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

front/dist/resources/characters/pipoya/Female 13-4.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

front/dist/resources/characters/pipoya/Female 14-1.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

front/dist/resources/characters/pipoya/Female 14-2.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

front/dist/resources/characters/pipoya/Female 14-3.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

front/dist/resources/characters/pipoya/Female 14-4.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

front/dist/resources/characters/pipoya/Female 15-1.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

front/dist/resources/characters/pipoya/Female 15-2.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

front/dist/resources/characters/pipoya/Female 15-3.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

front/dist/resources/characters/pipoya/Female 15-4.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

front/dist/resources/characters/pipoya/Female 16-1.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

front/dist/resources/characters/pipoya/Female 16-2.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

front/dist/resources/characters/pipoya/Female 16-3.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

front/dist/resources/characters/pipoya/Female 16-4.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

front/dist/resources/characters/pipoya/Female 17-1.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.6 KiB

BIN

front/dist/resources/characters/pipoya/Female 17-2.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.7 KiB

BIN

front/dist/resources/characters/pipoya/Female 17-3.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.7 KiB

BIN

front/dist/resources/characters/pipoya/Female 17-4.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.7 KiB

BIN

front/dist/resources/characters/pipoya/Female 18-1.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.5 KiB

BIN

front/dist/resources/characters/pipoya/Female 18-2.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.6 KiB

BIN

front/dist/resources/characters/pipoya/Female 18-3.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.5 KiB

BIN

front/dist/resources/characters/pipoya/Female 18-4.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.5 KiB

BIN

front/dist/resources/characters/pipoya/Female 19-1.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.2 KiB

BIN

front/dist/resources/characters/pipoya/Female 19-2.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.2 KiB

BIN

front/dist/resources/characters/pipoya/Female 19-3.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.2 KiB

BIN

front/dist/resources/characters/pipoya/Female 19-4.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.2 KiB

BIN

front/dist/resources/characters/pipoya/Female 20-1.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.4 KiB

BIN

front/dist/resources/characters/pipoya/Female 20-2.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.4 KiB

BIN

front/dist/resources/characters/pipoya/Female 20-3.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.4 KiB

BIN

front/dist/resources/characters/pipoya/Female 20-4.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.4 KiB

BIN

front/dist/resources/characters/pipoya/Female 21-1.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.7 KiB

BIN

front/dist/resources/characters/pipoya/Female 21-2.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.6 KiB

BIN

front/dist/resources/characters/pipoya/Female 21-3.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.6 KiB

BIN

front/dist/resources/characters/pipoya/Female 21-4.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.6 KiB

BIN

front/dist/resources/characters/pipoya/Female 22-1.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

front/dist/resources/characters/pipoya/Female 22-2.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

front/dist/resources/characters/pipoya/Female 22-3.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

front/dist/resources/characters/pipoya/Female 22-4.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

front/dist/resources/characters/pipoya/Female 23-1.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.4 KiB

BIN

front/dist/resources/characters/pipoya/Female 24-1.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

front/dist/resources/characters/pipoya/Female 25-1.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.5 KiB

BIN

front/dist/resources/characters/pipoya/Headmaster fmale.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.3 KiB

BIN

front/dist/resources/characters/pipoya/Headmaster male.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

front/dist/resources/characters/pipoya/Male 01-2.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.4 KiB

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