Commit Graph

1263 Commits

Author SHA1 Message Date
Jean-Philippe Evrard
e2f400472f Template google analytics data
Without this patch, the index.html contains google analytics at
all times, including for people self-hosting it.

This is a problem for privacy reasons, and only people wanting
to have analytics on their instances should be able to enable
them.

This fixes it by making sure the index.html page is templated
to sideload content from ANALYTICS_CODE_PATH (which itself is
also templated, for convenience).
2021-01-19 12:17:05 +01:00
grégoire parant
ddb7e2a12b
Merge pull request from thecodingmachine/fixFocusCamScene
Fix focus cam on select cam scene
2021-01-18 10:52:28 +01:00
Gregoire Parant
679dbd4215 Fix focus cam on select cam scene 2021-01-18 10:40:13 +01:00
Gregoire Parant
8c9e9522db Revert "Update ban feature"
This reverts commit d2ee52ce43.
2021-01-15 03:15:14 +01:00
Gregoire Parant
d2ee52ce43 Update ban feature 2021-01-15 03:14:15 +01:00
Kharhamel
871ee6b192
Merge pull request from thecodingmachine/fixLazyLoadCrash
fixed a crash linked to incorrect textureDescriptors
2021-01-14 15:14:25 +01:00
kharhamel
fd29826556 fixed a crash linked to incorrect textureDescriptors 2021-01-14 14:47:02 +01:00
David Négrier
842eadeb59
Merge pull request from thecodingmachine/fixpipelinenowebgl
Fixing bug when no WebGL is available
2021-01-13 18:45:16 +01:00
David Négrier
8cf481ec49 Fixing bug when no WebGL is available
The switch to Phaser 3.50 introduced a bug when WebGL is not available in a browser.
The changes in this commit prevent calls to the WebGL pipeline if the pipeline is not available.
2021-01-13 18:39:28 +01:00
grégoire parant
8ffba3157a
Merge pull request from thecodingmachine/customiseCharacters
Customise characters with admin console
2021-01-13 16:47:13 +01:00
Gregoire Parant
512be7acd2 New basic characters 2021-01-13 16:46:24 +01:00
grégoire parant
cd5d7cb826
Merge pull request from thecodingmachine/fixMenu
Fix menu
2021-01-12 19:56:47 +01:00
Gregoire Parant
993c58cf8e Fix select rectangle for customize scene 2021-01-12 19:49:48 +01:00
Gregoire Parant
987c80c9c4 Fix menu 2021-01-12 19:48:48 +01:00
grégoire parant
0f7f42b6f1
Merge pull request from thecodingmachine/screanSharing
Fix screen sharing
2021-01-12 19:24:06 +01:00
Gregoire Parant
123ee4bc43 Fix responsive and limite select cursor 2021-01-12 15:29:26 +01:00
David Négrier
449077899b
Merge pull request from thecodingmachine/dependabot/npm_and_yarn/pusher/systeminformation-4.31.1
Bump systeminformation from 4.30.5 to 4.31.1 in /pusher
2021-01-12 14:53:29 +01:00
Gregoire Parant
f8d4b696e8 Customise characters with admin console
- Add new characters choise
 - Display on 3 line of 6 pers
 - Add custom characters from admin console wilth level -1
2021-01-12 13:19:51 +01:00
grégoire parant
648e6aef97
Merge pull request from thecodingmachine/linkNotClickable
Verify URL in message
2021-01-12 11:30:11 +01:00
Kharhamel
4edf71d0c8
Merge pull request from thecodingmachine/lazyloading
All player textures are now lazy-loaded
2021-01-12 10:48:42 +01:00
kharhamel
472fbb1de0 All player textures are now lazy-loaded 2021-01-08 11:44:41 +01:00
Kharhamel
c2d0cda441
Merge pull request from thecodingmachine/master
Master
2021-01-07 14:00:45 +01:00
Kharhamel
186114a4e2
Merge pull request from thecodingmachine/phaser35
updated phaser to version 3.51 and fixed the BC breaks
2021-01-07 13:57:08 +01:00
Gregoire Parant
e8f1b2d048 Add clear array peer connection sharing 2021-01-07 12:58:45 +01:00
kharhamel
3ce8427378 fixed a game crashed because of lack of animations and improved the character class 2021-01-07 12:46:13 +01:00
Gregoire Parant
a88ad3cf4d Dont delete PeerSharingConnection because it will be resuse
When user try to screen charing with same user, the event send is not a offer but renegociation. So could clear arry only when user out of circle.
2021-01-07 12:13:12 +01:00
Gregoire Parant
018f01e878 Increase stability camera and microphone permission 2021-01-07 11:02:00 +01:00
Gregoire Parant
8c89b5e0b1 Permit to change style when getCamera was ready and permission accorded 2021-01-07 10:30:28 +01:00
Gregoire Parant
d4c7a20dfa Update feedback @moufmouf 2021-01-07 09:42:11 +01:00
Gregoire Parant
1659fa400f Increase stability to force stopped screen sharing 2021-01-06 17:09:17 +01:00
kharhamel
fbb44af369 added a basic loader 2021-01-06 17:08:48 +01:00
Gregoire Parant
73d7e798e9 Upgrade conversion
When user send multi message, scroll on last message
2021-01-06 17:08:13 +01:00
Kharhamel
0ebf8798ea
Merge pull request from thecodingmachine/dependabot/npm_and_yarn/back/axios-0.21.1
Bump axios from 0.20.0 to 0.21.1 in /back
2021-01-06 16:59:14 +01:00
dependabot[bot]
e13a5f3e64
Bump systeminformation from 4.30.5 to 4.31.1 in /pusher
Bumps [systeminformation](https://github.com/sebhildebrandt/systeminformation) from 4.30.5 to 4.31.1.
- [Release notes](https://github.com/sebhildebrandt/systeminformation/releases)
- [Changelog](https://github.com/sebhildebrandt/systeminformation/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sebhildebrandt/systeminformation/compare/v4.30.5...v4.31.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-01-06 14:41:47 +00:00
dependabot[bot]
358292840b
Bump axios from 0.20.0 to 0.21.1 in /back
Bumps [axios](https://github.com/axios/axios) from 0.20.0 to 0.21.1.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v0.21.1/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.20.0...v0.21.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-01-06 14:41:45 +00:00
Kharhamel
de56f2e6c9
Merge pull request from thecodingmachine/dependabot/npm_and_yarn/pusher/axios-0.21.1
Bump axios from 0.20.0 to 0.21.1 in /pusher
2021-01-06 15:41:02 +01:00
kharhamel
1359fbe977 updated phaser to version 3.51 and fixed the BC 2021-01-06 15:00:54 +01:00
Gregoire Parant
4397ff7712 Update style and focus keyboard 2021-01-06 13:36:18 +01:00
Gregoire Parant
438469ae24 Verify URL in message 2021-01-06 12:20:02 +01:00
dependabot[bot]
3e0b85701c
Bump axios from 0.20.0 to 0.21.1 in /pusher
Bumps [axios](https://github.com/axios/axios) from 0.20.0 to 0.21.1.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v0.21.1/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.20.0...v0.21.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-01-06 10:33:33 +00:00
David Négrier
178af22280
Merge pull request from thecodingmachine/dependabot/npm_and_yarn/back/systeminformation-4.31.1
Bump systeminformation from 4.30.5 to 4.31.1 in /back
2021-01-06 09:57:45 +01:00
dependabot[bot]
eb56e05e1d
Bump systeminformation from 4.30.5 to 4.31.1 in /back
Bumps [systeminformation](https://github.com/sebhildebrandt/systeminformation) from 4.30.5 to 4.31.1.
- [Release notes](https://github.com/sebhildebrandt/systeminformation/releases)
- [Changelog](https://github.com/sebhildebrandt/systeminformation/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sebhildebrandt/systeminformation/compare/v4.30.5...v4.31.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-01-06 08:19:02 +00:00
David Négrier
a9bef547c5
Merge pull request from thecodingmachine/dependabot/npm_and_yarn/front/axios-0.21.1
Bump axios from 0.20.0 to 0.21.1 in /front
2021-01-06 09:18:08 +01:00
dependabot[bot]
c7ed0bf8bb
Bump axios from 0.20.0 to 0.21.1 in /front
Bumps [axios](https://github.com/axios/axios) from 0.20.0 to 0.21.1.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v0.21.1/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.20.0...v0.21.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-01-05 23:50:25 +00:00
Kharhamel
a270b6260a
Merge pull request from thecodingmachine/level3URllink
HOTFIX: Allow exitUrl relative links to rewrite map domain and map instance
2021-01-05 19:12:17 +01:00
kharhamel
6caa0e5b62 HOTFIX: the map property exitUrl now accept relative links that are deep enough to rewrite the base url 2021-01-05 18:23:17 +01:00
David Négrier
dea7d6dba7
Merge pull request from Informatic/feature/map-sounds
[rC3] front: implement map sounds
2021-01-05 13:42:50 +01:00
David Négrier
a4743d5ba4
Merge pull request from Mewp/pusher-configurable-port
Add a PUSHER_HTTP_PORT configuration variable.
2021-01-05 11:53:37 +01:00
Mewp
4be009d5a1 Add a PUSHER_HTTP_PORT configuration variable.
Some deployments might not be based on docker, and not on separate
hosts. In such cases, it would be useful to be able to configure the
port pusher listens on.
2021-01-04 18:23:33 +01:00
David Négrier
359fa3a571
Merge pull request from thecodingmachine/develop
Release 2021-01-04
2021-01-04 18:13:53 +01:00