jonny
318749e5a8
develop merge
2021-06-17 11:30:16 +02:00
jonny
d416deec5e
Merge branch 'iframe-api-refactor' of github.com:jonnytest1/workadventure into iframe-api-refactor
2021-06-17 11:30:05 +02:00
Kharhamel
3a569ec0d6
Merge pull request #1095 from thecodingmachine/dependabot/npm_and_yarn/benchmark/ws-7.4.6
...
Bump ws from 7.3.1 to 7.4.6 in /benchmark
2021-06-17 11:29:33 +02:00
dependabot[bot]
47008c015e
Bump ws from 7.3.1 to 7.4.6 in /benchmark
...
Bumps [ws](https://github.com/websockets/ws ) from 7.3.1 to 7.4.6.
- [Release notes](https://github.com/websockets/ws/releases )
- [Commits](https://github.com/websockets/ws/compare/7.3.1...7.4.6 )
Signed-off-by: dependabot[bot] <support@github.com>
2021-06-17 09:25:14 +00:00
Kharhamel
5159f69a59
Merge pull request #576 from Informatic/fix/dependencies-cleanup
...
back,pusher,uploader: cleanup dependencies
2021-06-17 11:24:26 +02:00
David Négrier
f6554a1082
Merge branch 'develop' of github.com:thecodingmachine/workadventure into iframe-api-refactor
...
# Conflicts:
# front/src/iframe_api.ts
2021-06-17 11:23:56 +02:00
jonny
efa1e52ce1
Merge remote-tracking branch 'remotes/workadventure-main/develop' into iframe-api-refactor
2021-06-17 11:19:21 +02:00
David Négrier
e6264948b1
Merge pull request #946 from jonnytest1/load-page-api
...
Load page iframe-api
2021-06-16 18:10:10 +02:00
jonny
8d2baa8d1a
added workadventure specific url
2021-06-16 17:36:52 +02:00
jonny
1147a21dde
fixed documentation
2021-06-16 17:34:00 +02:00
jonny
c1e202b7b1
renamed to goToRoom
2021-06-16 17:16:00 +02:00
David Négrier
a910ec1639
Merge pull request #1190 from thecodingmachine/svelte_check
...
Adding svelte-check to the build process
2021-06-15 18:40:14 +02:00
David Négrier
0afdbf7040
Fixing Svelte-check errors
2021-06-15 18:34:11 +02:00
David Négrier
085a4d41fd
Adding svelte-check to the build process
...
Type checking in Svelte was not enabled (because we were not running svelte-check).
This PR adds:
- run svelte-check in watch mode in development
- run svelte-check in CI
2021-06-15 18:08:16 +02:00
Kharhamel
7e9506874c
Merge pull request #1188 from thecodingmachine/sceneCleanup
...
scene cleanup
2021-06-15 17:01:57 +02:00
kharhamel
c559b2104b
scene cleanup
2021-06-15 15:32:40 +02:00
jonny
7712bd685b
fixed merge errors
2021-06-15 15:19:45 +02:00
jonny
238f333b81
Merge remote-tracking branch 'remotes/workadventure-main/develop' into load-page-api
...
# Conflicts:
# front/src/Api/Events/IframeEvent.ts
# front/src/Api/IframeListener.ts
# front/src/Phaser/Game/GameScene.ts
# front/src/iframe_api.ts
2021-06-15 15:05:49 +02:00
Kharhamel
407f46f248
Merge pull request #1187 from thecodingmachine/touchIframeResize
...
FIX: fixed the cowebsite aside dom not being visible on some browser
2021-06-15 14:40:26 +02:00
kharhamel
40e2ba196d
FIX: fixed the cowebsite aside dom not being visible on some browser
2021-06-15 14:35:29 +02:00
David Négrier
eb895ceb58
Merge pull request #1178 from thecodingmachine/touchIframeResize
...
FIX: cowebsite resize now works on touchscreens
2021-06-15 11:42:41 +02:00
David Négrier
cbc80391d8
Merge pull request #1186 from thecodingmachine/customSceneNewArrow
...
CustomizeScene buttons use moveHorizontally and moveVertically
2021-06-15 11:38:48 +02:00
GRL
09da69c24a
CustomizeScene buttons use moveHorizontally and moveVertically
2021-06-15 11:16:44 +02:00
kharhamel
a5779095f8
FIX: cowebsite resize now works on touchscreens
2021-06-15 10:55:18 +02:00
David Négrier
1880022971
Merge pull request #1154 from thecodingmachine/gameSizeFix
...
Display Game
2021-06-15 09:16:00 +02:00
GRL
b04016f30f
Merge branch 'develop' of github.com:thecodingmachine/workadventure into gameSizeFix
2021-06-15 09:06:47 +02:00
David Négrier
0172d7dc3b
Merge pull request #1182 from thecodingmachine/fix_viewport_on_resize
...
Fixing size of camera on resize
2021-06-14 18:49:37 +02:00
David Négrier
6bca3469b6
Removing useless import
2021-06-14 18:44:20 +02:00
David Négrier
1fa03e44df
Fixing size of camera on resize
...
The size of the Camera after a change in zoom is only computed on the "render" step.
Therefore, we should wait the "render" step to call GameScene.onResize.
Closes #1180
2021-06-14 18:40:58 +02:00
David Négrier
9f9584633c
Merge pull request #1181 from thecodingmachine/disable_screensharing_button_on_error
...
Disable screensharing button if user refuses rights
2021-06-14 18:22:20 +02:00
David Négrier
6af9b5d0fc
Disable screensharing button if user refuses rights
...
If the user refuses the popup to screen-share, we should switch back the button to gray.
Closes #1179
2021-06-14 18:18:57 +02:00
David Négrier
f16514db21
Merge pull request #1177 from thecodingmachine/bugfix/1167
...
Making code more robust regarding scene being null in Character class
2021-06-14 16:54:12 +02:00
David Négrier
a8ef43ca84
Merge pull request #1176 from thecodingmachine/fix_character_scene_slow
...
Fixing bug slowing down the CustomizeScene a lot
2021-06-14 16:41:55 +02:00
David Négrier
dcd44f283f
Making code more robust regarding scene being null in Character class
...
Not sure how this can happen but it does.
Closes #1167
2021-06-14 16:40:33 +02:00
David Négrier
e3ee66527a
Fixing bug slowing down the CustomizeScene a lot
...
By forcing the containers to be updated only in the "update" method, we seem to be solving some bugs regarding the way sprites are handled.
There is still an issue though. Some times, for some reasons, the update list seems to be growing a lot.
The more we click the left/right arrow to choose a character, the slower it gets (but with this commit, it does not lock anymore)
2021-06-14 16:32:09 +02:00
GRL
b239edb266
Clean code
2021-06-14 16:09:41 +02:00
GRL
c2fba35360
Suppression blue back-ground
2021-06-14 16:04:55 +02:00
GRL
281b8580cd
Use window and not viewport in css for main-container
2021-06-14 15:54:22 +02:00
GRL
f103a919f2
Merge branch 'develop' of github.com:thecodingmachine/workadventure into gameSizeFix
2021-06-14 14:25:59 +02:00
David Négrier
94333a7438
Merge pull request #1164 from thecodingmachine/wildcard-cert-in-cd
...
Installing Wildcard certificate in CD environments
2021-06-11 15:40:00 +02:00
David Négrier
2159e70399
Deleting old certificate if one already exists
2021-06-11 15:31:27 +02:00
David Négrier
fdf4b901b8
Fixing URL in message
2021-06-11 15:02:54 +02:00
David Négrier
2260f772a7
Create the K8S namespace if required
2021-06-11 14:52:59 +02:00
David Négrier
a6effe0a29
Fixing scp
2021-06-11 14:44:23 +02:00
David Négrier
9b985a2a0c
Providing Base 64 config file
2021-06-11 14:37:43 +02:00
David Négrier
83089f1197
Fixing key access rights
2021-06-11 14:25:02 +02:00
David Négrier
c07d54f4c3
Fixing key access rights
2021-06-11 14:13:23 +02:00
David Négrier
8b5055c7ef
Disabling host check (not a big deal since we are only downloading files from the host)
2021-06-11 14:06:08 +02:00
David Négrier
9330a3ec89
Installing Wildcard certificate in CD environments
...
Because we are limited to 50 domain names per week with Let's encrypt, the continuous delivery environment is pretty fast failing to get new certificates.
We need to download a Wilcard certificate instead for the CD environments.
2021-06-11 11:57:27 +02:00
Kharhamel
c44d453f20
Merge pull request #1160 from thecodingmachine/betterVisitCardBis
...
FIX: Improved the visuals of the visit card
2021-06-10 17:37:10 +02:00