_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,647 Commits 2 Branches 0 Tags 47 MiB
07b3dc0f5e
Commit Graph

2647 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
_Bastler
de9d96f090 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-06-17 12:28:03 +02:00
jonny
702f4fe4c0 converted goToRoom to typed call 2021-06-17 11:32:59 +02:00
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
d6ec0d22d3 Code cleanup 2021-06-17 10:35:08 +02:00
David Négrier
d533894a74 Fixing warnings and moving biggest area compute in store 2021-06-17 10:13:23 +02:00
David Négrier
d3544e2d97 Ignoring "no tracks" warning (cause really, we cannot add tracks to live streams) 2021-06-17 10:07:27 +02:00
David Négrier
d888b694cc Adding button to change layout 2021-06-17 10:07:27 +02:00
David Négrier
3b278d0498 Removing dead code 2021-06-17 10:07:27 +02:00
David Négrier
76261de805 Enabling back the open report feature 2021-06-17 10:07:27 +02:00
David Négrier
ca56a78814 Limiting the max height of video elements 2021-06-17 10:07:27 +02:00
David Négrier
5cf5e0ce2b Changing the way we focus a video element. 
Now, only one video element can be important.
 2021-06-17 10:07:27 +02:00
David Négrier
ac7fa164b6 Adding importance handling 2021-06-17 10:07:27 +02:00
David Négrier
e7b0f859a5 Migrating the video overlay in Svelte (WIP) 2021-06-17 10:07:27 +02:00
_Bastler
b96ba7f8c5 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-06-16 19:58:34 +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
_Bastler
59ab1cdbae remove focus (unneccesary) 2021-06-16 12:06:23 +02:00
_Bastler
a3bed1eeb4 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-06-16 11:38:43 +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
David Négrier
39a7b95e32
Merge pull request #1189 from thecodingmachine/develop 
Deploy 2021-06-15
 2021-06-15 17:20:19 +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
_Bastler
b3c58bd5d4 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-06-15 15:24:00 +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
_Bastler
29da03ee44 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-06-15 09:21:40 +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
_Bastler
39dbd56207 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-06-15 08:18:39 +02:00
David Négrier
9c14bd9c90
Merge pull request #1183 from thecodingmachine/develop 
Deploy 2021-06-14
 2021-06-14 22:19:02 +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