David Négrier
|
979e43bb05
|
Merge pull request #830 from thecodingmachine/discordbadge
Adding Discord badge to the README
|
2021-03-23 09:41:40 +01:00 |
|
David Négrier
|
23c33b2971
|
Adding Discord badge to the README
This should be merged only when the Discord widget mode is enabled on the server (otherwise the number of current users is not displayed)
|
2021-03-23 09:41:18 +01:00 |
|
David Négrier
|
4966789b3b
|
Merge pull request #663 from shug0/patch-1
Correct the local app url in README
|
2021-03-22 16:33:03 +01:00 |
|
David Négrier
|
ce0ede7613
|
Merge pull request #805 from thecodingmachine/dependabot/npm_and_yarn/front/elliptic-6.5.4
Bump elliptic from 6.5.3 to 6.5.4 in /front
|
2021-03-22 16:31:59 +01:00 |
|
David Négrier
|
6bb757e8b5
|
Merge pull request #824 from workadventure-xce/fix/front-page-template
Fix/front page template
|
2021-03-22 16:30:53 +01:00 |
|
Kharhamel
|
04bd60ca26
|
Merge pull request #827 from workadventure-xce/fix/jitsi_integration
Fix Jitsi integration
|
2021-03-22 16:27:32 +01:00 |
|
David Négrier
|
9da0acb0d7
|
Merge pull request #814 from Wikinaut/patch-1
update /etc/hosts readme
|
2021-03-22 16:12:48 +01:00 |
|
David Négrier
|
96492e8594
|
Merge pull request #826 from workadventure-xce/fix/scrollbars
Remove scroll bars
|
2021-03-22 15:06:23 +01:00 |
|
PizZaKatZe
|
318c63ab90
|
Fix Jitsi integration
Jitsi iframes are rendered directly in the cowebsite div next to the
cowebsite > main element. This patch fixes the situation.
|
2021-03-22 11:36:14 +01:00 |
|
PizZaKatZe
|
13fcda7bcf
|
Remove scroll bars
|
2021-03-21 12:55:14 +01:00 |
|
PizZaKatZe
|
c0bf5755ed
|
front: Fix page template
|
2021-03-21 11:28:02 +01:00 |
|
PizZaKatZe
|
97ec721c2a
|
front: Fix page template indentation
|
2021-03-21 11:28:02 +01:00 |
|
Kharhamel
|
519018f6c5
|
Merge pull request #764 from githubIsNotOpenSourceLOL/patch-1
Use email address from .env
|
2021-03-19 17:30:12 +01:00 |
|
David Négrier
|
4660b450c5
|
Merge pull request #700 from thecodingmachine/audioCameraPermission
Input need camera and microphone permission
|
2021-03-19 17:09:48 +01:00 |
|
GRL
|
e50c8bc354
|
Suppression of *{...} in every HTML files because the style.ccs file already declare it.
Suppression unused code
|
2021-03-19 16:21:35 +01:00 |
|
GRL
|
0eb16bce6f
|
Suppression width in Html file
|
2021-03-19 15:58:02 +01:00 |
|
GRL
|
1cfb22f695
|
Creation of the HelpCameraSettingsScene
Update of GameManager and index to include the new scene
Change title of helpCameraSettings
Suppression function reset
|
2021-03-19 15:40:07 +01:00 |
|
GRL
|
0b00055eda
|
Use includes instead of indexOf
|
2021-03-19 14:40:18 +01:00 |
|
GRL
|
c654f722e3
|
Add Firefox image
Check permissions in the game
Button Continue to continue without allowing camera and microphone
|
2021-03-19 12:04:37 +01:00 |
|
Gregoire Parant
|
d68406d5e1
|
Create input need page
|
2021-03-19 12:02:42 +01:00 |
|
Kharhamel
|
1f85e548ce
|
Merge pull request #816 from thecodingmachine/iframeResize
FEATURE: complete control over the iframe size
|
2021-03-18 16:16:54 +01:00 |
|
kharhamel
|
32fdfaab35
|
edited CoWebsiteManager to manage vertical resizing
|
2021-03-18 16:11:22 +01:00 |
|
githubIsNotOpenSourceLOL
|
ec691a75fe
|
Update .env.template
|
2021-03-18 13:26:02 +01:00 |
|
kharhamel
|
0701e607fa
|
added sass loader to the project and put the cowebsite style in its own sass file
|
2021-03-18 12:37:05 +01:00 |
|
kharhamel
|
f9c8b4131c
|
added fullscreen
|
2021-03-17 18:57:00 +01:00 |
|
kharhamel
|
272be3eba0
|
improve the visual of the cowebsite
|
2021-03-17 18:35:19 +01:00 |
|
kharhamel
|
3f6c61633a
|
FEATURE: complete control over the iframe size
|
2021-03-17 18:34:12 +01:00 |
|
Kharhamel
|
19856c0ee9
|
Merge pull request #783 from Moini/patch-1
Improve visibility of close button for embedded web pages
|
2021-03-17 14:35:11 +01:00 |
|
Wikinaut
|
d8c74fa838
|
update /etc/hosts readme
|
2021-03-15 15:37:51 +01:00 |
|
Kharhamel
|
18fa1e6153
|
Merge pull request #807 from thecodingmachine/improvePlayerAnims
FIX: player anims correctly stop on the idle frame
|
2021-03-11 16:34:20 +01:00 |
|
kharhamel
|
fe8c75610d
|
FIX: player anims correctly stop on the idle frame
|
2021-03-11 16:21:02 +01:00 |
|
Gregoire Parant
|
59c310d0a8
|
Update to optimize maintainability of the code
|
2021-03-11 12:17:37 +01:00 |
|
Gregoire Parant
|
2fcb8a76b1
|
Merge branch 'master' into develop
# Conflicts:
# front/src/Connexion/RoomConnection.ts
# front/src/Phaser/Menu/ReportMenu.ts
|
2021-03-11 02:22:05 +01:00 |
|
grégoire parant
|
ce6976ec34
|
Merge pull request #806 from thecodingmachine/hot-fix-moderate-controls
Hot fix moderate controls
|
2021-03-11 02:13:15 +01:00 |
|
Gregoire Parant
|
2cf99df2da
|
Hot Fix report
|
2021-03-11 02:03:06 +01:00 |
|
Gregoire Parant
|
46cb9333e6
|
HotFix message in back
|
2021-03-11 01:25:36 +01:00 |
|
dependabot[bot]
|
d95c71281f
|
Bump elliptic from 6.5.3 to 6.5.4 in /front
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.3 to 6.5.4.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.3...v6.5.4)
Signed-off-by: dependabot[bot] <support@github.com>
|
2021-03-10 13:26:46 +00:00 |
|
David Négrier
|
a28fcbb9e6
|
Catching error when JWT token cannot be generated to avoid crashing Pusher
|
2021-03-10 09:41:54 +01:00 |
|
Kharhamel
|
21cc842c33
|
Merge pull request #793 from thecodingmachine/adminWorldsLimit
FEATURE: the connexion error an user can get when a world is full is now correctly treated.
|
2021-03-09 17:45:43 +01:00 |
|
kharhamel
|
8abc34c631
|
FEATURE: the connexion error an user can get when a world is full is now correctly traited. Also remove a redundant adminApi call
|
2021-03-09 16:34:19 +01:00 |
|
David Négrier
|
f3c67a94ee
|
Trying to enable back connection on admin from develop, knowing that the develop certificate is broken. Fixing priority.
|
2021-03-09 09:12:55 +01:00 |
|
David Négrier
|
1a4c7ad928
|
Trying to enable back connection on admin from develop, knowing that the develop certificate is broken
|
2021-03-08 10:58:57 +01:00 |
|
David Négrier
|
80df1ffb5f
|
Revert "Adding back admin in develop branch CI"
This reverts commit c384a73edf.
|
2021-03-05 17:45:16 +01:00 |
|
David Négrier
|
c384a73edf
|
Adding back admin in develop branch CI
|
2021-03-05 16:52:54 +01:00 |
|
David Négrier
|
99ab99d893
|
Merge pull request #792 from thecodingmachine/gafix
Fixing GA tag not included in play domain
|
2021-03-05 10:52:16 +01:00 |
|
David Négrier
|
15405633d1
|
Fixing GA tag not included in play domain
The GA tag was not properly included because the index.html file that contained it was overwritten by Webpack's HtmlWebpackPlugin.
|
2021-03-05 10:00:11 +01:00 |
|
David Négrier
|
bf8e8bf777
|
Merge pull request #689 from znerol-forks/feature/cowebsite-load-map-relative-url
Allow URLs relative to map base in iframe / openWebsite
|
2021-03-04 18:21:48 +01:00 |
|
Kharhamel
|
5833629469
|
Merge pull request #784 from thecodingmachine/betterGlobalMessage
FEATURE: better implementation of the admin global message
|
2021-03-04 18:10:52 +01:00 |
|
kharhamel
|
ad7e16c33b
|
FEATURE: better implementation of the admin global message
|
2021-03-04 16:18:06 +01:00 |
|
grégoire parant
|
df610aa01b
|
Merge pull request #785 from thecodingmachine/updatePrivateAccess
Update private access
|
2021-03-02 14:35:39 +01:00 |
|