Merge branch 'develop' into loadTileset
# Conflicts: # CHANGELOG.md # front/src/Phaser/Game/GameScene.ts
This commit is contained in:
commit
f2d382681b
53 changed files with 1461 additions and 1898 deletions
|
@ -58,11 +58,17 @@
|
|||
"height":94.6489098314831,
|
||||
"id":1,
|
||||
"name":"",
|
||||
"properties":[
|
||||
{
|
||||
"name":"font-family",
|
||||
"type":"string",
|
||||
"value":"\"Press Start 2P\""
|
||||
}],
|
||||
"rotation":0,
|
||||
"text":
|
||||
{
|
||||
"fontfamily":"Sans Serif",
|
||||
"pixelsize":11,
|
||||
"pixelsize":8,
|
||||
"text":"Test:\nWalk on the carpet and press space\nResult:\nJitsi opens on meet.jit.si (check this in the network tab). Note: this test only makes sense if the default configured Jitsi instance is NOT meet.jit.si (check your .env file)",
|
||||
"wrap":true
|
||||
},
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue