Commit Graph

1761 Commits

Author SHA1 Message Date
_Bastler
f82b106dce Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-06-22 14:26:47 +02:00
David Négrier
eb526f5b67 Upgrading animatedtiles plugin to trigger an event when an animation occurs and setting the scene to dirty state 2021-06-22 14:21:15 +02:00
GRL
ca3f5c599a Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi 2021-06-22 14:00:19 +02:00
GRL
55d99b24f4 Correction form review and checks 2021-06-22 10:43:20 +02:00
GRL
0cc7ed1647 Merge branch 'develop' of github.com:thecodingmachine/workadventure into adminSvelte 2021-06-22 10:36:16 +02:00
GRL
4fedc30301 Correction form review and checks 2021-06-22 10:27:54 +02:00
GRL
da5ae02a06 Correction form review and checks 2021-06-22 10:22:49 +02:00
David Négrier
1283e86ce8 Adding test map for animated tiles 2021-06-22 10:22:48 +02:00
GRL
8a1c57c434 Correction form review and checks 2021-06-22 10:10:03 +02:00
GRL
267a0bbe4d Correction form review and checks 2021-06-22 09:49:04 +02:00
GRL
5cac4f52bc Correction form review and checks 2021-06-22 09:43:41 +02:00
jonny
8be29062f6 reverted import sorting 2021-06-21 18:41:41 +02:00
jonny
64a00481f0 fixed wrong import 2021-06-21 18:39:02 +02:00
jonny
ba1bcf226a menu command api 2021-06-21 18:22:31 +02:00
kharhamel
42c0d1002f FIX: no more whitespaces in player names 2021-06-21 17:58:04 +02:00
David Négrier
e4dab5fd0d Merge branch 'develop' of github.com:thecodingmachine/workadventure into feature/animated-tiles
# Conflicts:
#	front/package.json
#	front/tsconfig.json
#	front/yarn.lock
2021-06-21 17:26:00 +02:00
GRL
232fd33ec8 Migrating ConsoleGlobalMessageManager in svelte 2021-06-21 17:19:27 +02:00
David Négrier
b59cbcac4c Merge branch 'develop' of github.com:thecodingmachine/workadventure into svelte_video_overlay
# Conflicts:
#	front/package.json
2021-06-21 14:54:32 +02:00
David Négrier
cddade059f Removing commented code 2021-06-21 14:49:41 +02:00
David Négrier
a08f6a33ac Improving naming 2021-06-21 14:43:10 +02:00
David Négrier
77a4d23301 Renaming biggestAvailableArray to biggestAvailableArea + removing duplicated code. 2021-06-21 14:07:03 +02:00
David Négrier
6101548d89 Fixing bug where only one chat listener can be added. 2021-06-21 13:47:07 +02:00
David Négrier
620bd1ab2c Splitting classes in separated files 2021-06-21 12:26:12 +02:00
David Négrier
ce0a52c227 Merge branch 'develop' of github.com:thecodingmachine/workadventure into iframe-api-refactor2
# Conflicts:
#	front/package-lock.json
2021-06-21 11:53:07 +02:00
David Négrier
9129ceede1 Improving refactoring of API following @jonnytest1 feedback 2021-06-21 11:48:39 +02:00
jonny
7716fe4b62 run templater on running start script 2021-06-20 19:26:35 +02:00
jonny
5bf943ce77 converted cache to constant lookup time 2021-06-20 19:14:04 +02:00
jonny
92485a02cf tileIndex setting got merged out 2021-06-19 15:46:32 +02:00
jonny
c1d9b2c9ed coverted property map to object 2021-06-19 15:41:58 +02:00
jonny
27ccdf165c fixed merge imports 2021-06-19 15:24:27 +02:00
jonny
74dda8ab69 allow properties on tiles
# Conflicts:
#	front/src/Phaser/Game/GameMap.ts
#	front/src/Phaser/Map/ITiledMap.ts
2021-06-19 15:23:30 +02:00
David Négrier
34dc5a0bc6 Refactoring WorkAdventureAPI.
Simplifying a lot what was done (even if the new code is a bit less automated, it allows to list exactly the methods we want to see deprecated and to add a notification message)
2021-06-18 17:22:56 +02:00
jonny
0690f088b6 setup to also run on windows 2021-06-18 00:21:54 +02:00
David Négrier
227575043b Removing dead code 2021-06-17 18:56:30 +02:00
David Négrier
4ec92ddf58 Adding new icons for the change layout button 2021-06-17 18:30:08 +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
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
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
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
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
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
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
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
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
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
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
kharhamel
4d467e9f86 FIX: Improved the visuals of the visit card 2021-06-10 16:57:33 +02:00
GRL
d26502a724 Use HtmlUtils to get DOM Element game 2021-06-10 09:23:25 +02:00
grégoire parant
5a2b3a303a
Improve texture loaded from admin (#1151) 2021-06-09 22:33:42 +02:00
GRL
6868128267 DOM Element game resize at the same time and the same size at the canvas of phaser
Remove VisitCard scss unused
2021-06-09 18:08:14 +02:00
GRL
61180a6e64 The cam of other people in a bubble is at the top of the screen even when a iframe is open on mobile 2021-06-09 15:29:37 +02:00
David Négrier
07e6438902
Merge pull request #1145 from thecodingmachine/dimensionMobile
Mobile sizing problem
2021-06-08 18:21:05 +02:00
GRL
f6b3b9cfd4 Update facebook link 2021-06-08 18:05:03 +02:00
_Bastler
672a94be04 change avatar label 2021-06-08 16:51:08 +02:00
David Négrier
bcc86d6041
Merge pull request #1144 from thecodingmachine/betterVisitCard
FIX: improved the visit card, cleanup the code
2021-06-08 16:47:13 +02:00
_Bastler
7a10f4ecb6 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-06-08 16:46:32 +02:00
kharhamel
dd45996f9c FIX: improved the visit card, cleanup the code 2021-06-08 16:39:22 +02:00
GRL
4c1dd914eb DOM element game 1OO% height 2021-06-08 16:32:21 +02:00
David Négrier
5c9da4a725
Merge pull request #1139 from thecodingmachine/fix-webcam-name
Fixing the cleaning of webcam name
2021-06-08 14:35:13 +02:00
David Négrier
01c128e413
Merge pull request #1088 from thecodingmachine/dependabot/npm_and_yarn/front/dns-packet-1.3.4
Bump dns-packet from 1.3.1 to 1.3.4 in /front
2021-06-08 14:05:02 +02:00
David Négrier
fab5c17dc2 Fixing the cleaning of webcam name
Closes #1130
2021-06-08 12:19:07 +02:00
David Négrier
1b89adc604
Merge pull request #1137 from thecodingmachine/fix_script_prod
Fixing scripting origin check
2021-06-08 10:29:55 +02:00
David Négrier
e3223164b6
Merge pull request #1117 from thecodingmachine/selectCharacterFix
Fix : SelectCharacterScene and SelectCompanionScene
2021-06-08 10:29:21 +02:00
David Négrier
0c38f3b55c
Merge pull request #1131 from thecodingmachine/safari-fix
Fix broken layout on EnableCameraScene on mobile
2021-06-08 10:28:38 +02:00
GRL
d615a7c6a5 suppression comments 2021-06-08 10:12:59 +02:00
GRL
7a3921947a dark mode on select 2021-06-08 10:10:33 +02:00
GRL
1cceed2fd6 dark mode on select 2021-06-08 09:52:52 +02:00
GRL
a7cf071971 max height on select on all device and screen 2021-06-08 09:10:06 +02:00
Kharhamel
e2295d2419
Merge pull request #1133 from thecodingmachine/disableVisitCard
FIX: the visit card feature can now be disabled client side
2021-06-07 19:12:37 +02:00
GRL
aa9c3b9f4f max height on select 2021-06-07 17:18:39 +02:00
David Négrier
b03ee5bd53 Fixing scripting origin check
When working on making the openCoWebsite URL relative, we introduced a regression.
In production, the iframe generated by "script" properties have no "src" and therefore, were treated as invalid messages.

This should fix everything in prod.
2021-06-07 16:48:52 +02:00
GRL
c9da38c7ec reduce select field 2021-06-07 16:23:00 +02:00
GRL
000be7aa49 console 2021-06-07 16:12:31 +02:00
kharhamel
1264b286b2 FIX: trying to start a emote after a scene is desotryed should not crash the game 2021-06-07 15:11:54 +02:00
kharhamel
26f21fe6e4 FIX: the visit card feature can now be disabled client side 2021-06-07 15:01:21 +02:00
GRL
88a72e0153 change width of select field 2021-06-07 15:00:01 +02:00
GRL
3e1f10491a font-size reduce by 20%
img width = 1vw
2021-06-07 14:40:38 +02:00
GRL
dd0391687f change font-size
Change width and margin of img on mobile
2021-06-07 14:19:50 +02:00
David Négrier
311c74584c Merge branch 'master' of github.com:thecodingmachine/workadventure into develop 2021-06-07 10:42:27 +02:00
David Négrier
ac911cff4b Properly escaping name in discussion manager 2021-06-07 10:42:08 +02:00
GRL
cbf786fd56 Remove img and margin 2021-06-07 10:29:38 +02:00
GRL
e45198e403 Remove marging bottom of SelectWebcamForm 2021-06-07 10:09:51 +02:00
GRL
23c74bd7aa Create a PR to fix broken layout on EnableCameraScene on mobile 2021-06-07 09:27:49 +02:00
GRL
edfdc3bf47 comment on pointerTimer and pointerClicked 2021-06-07 09:17:24 +02:00
_Bastler
d20ca2f15b Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-06-04 21:08:43 +02:00
Kharhamel
d464f94e0f
Merge pull request #1127 from thecodingmachine/fixMobileVisitCard
FIX: temporary fix for visit card on mobile
2021-06-04 19:40:28 +02:00
kharhamel
8afa94aae3 FIX: temporary fix for visit card on mobile 2021-06-04 19:36:30 +02:00
GRL
3e19234edc Change <dialog> for ErrorDialog in <div> because only Chrome knows <dialog> 2021-06-04 16:32:21 +02:00
David Négrier
bacd260547 Prevents error message from being displayed twice in the same dialog 2021-06-04 16:22:15 +02:00
David Négrier
9f09dc9df2 Adding a special error message for non Safari browsers on iOS < 14.3 2021-06-04 16:19:41 +02:00
David Négrier
469cac9656 Making sure the "stopped screensharing" log is not displayed on startup 2021-06-04 16:08:02 +02:00
David Négrier
01ce94585a Displaying only message in the Dialog error (and not the exception name in front of the message) 2021-06-04 16:07:36 +02:00
GRL
a58d6353cd Merge branch 'develop' of github.com:thecodingmachine/workadventure into iphoneCompatibility 2021-06-04 16:02:46 +02:00
David Négrier
fd4f09588e Adding "playsinline" tag in remote <video> tags for iPhone compatibility (test) 2021-06-04 14:16:21 +02:00
_Bastler
eee3956b60 merge latest dev + fix font 2021-06-04 11:14:49 +02:00
David Négrier
2905a5570c Removing commented code 2021-06-04 10:33:24 +02:00
David Négrier
f4ed527fe8 Adding a global error message
This error message should be used for non fatal errors (otherwise, use the ErrorScene).
It is implemented using Svelte and the new "$errorStore".

Use `errorStore.addErrorMessage` to display the error popup with the message.

This PR uses this error message to display a popup explaining the browser is too old for WebRTC.
2021-06-04 10:33:22 +02:00
David Négrier
a8b91561dc Merge branch 'master' of github.com:thecodingmachine/workadventure into develop 2021-06-04 10:07:57 +02:00
David Négrier
b7ac3b8fad Generating HTML link using DOM manipulation rather that string manipulation 2021-06-04 10:07:12 +02:00
GRL
247d508d09 create PR to test iphone compatibility 2021-06-04 10:01:08 +02:00
GRL
0d2b190222 Replace setTimeout by timer manage in Update 2021-06-04 09:39:33 +02:00
_Bastler
f24a547814 merge dev 2021-06-04 08:53:45 +02:00
jonny
dab3f1f844 removed zoned popups 2021-06-03 22:01:42 +02:00
Gregoire Parant
e190c3b8d6 Merge branch 'master' into develop
# Conflicts:
#	front/src/WebRtc/MediaManager.ts
2021-06-03 20:15:50 +02:00
grégoire parant
eec15b38bb
Hot Fix open & close iframe (#1115) 2021-06-03 20:05:39 +02:00
kharhamel
c5f3cfe87c FEATURE: clicking on another player show a contact card when possible 2021-06-03 17:58:21 +02:00
grégoire parant
fffd36267d
Hot Custom Characters Scene (#1113) 2021-06-03 17:22:31 +02:00
GRL
02ff6fb5bf Add timer so that pointerdown event can't be call two time in one click 2021-06-03 17:08:56 +02:00
GRL
c435b7451e Update don't call createPlayer but call moveUser
Change time of pointerclicked from 100ms to 250ms
Suppression of console.log
2021-06-03 16:54:52 +02:00
David Négrier
46666d17dc Making sure the report audio sound does not break the application on iOS 2021-06-03 15:56:06 +02:00
David Négrier
50e994c674 Attempt to switch bubble sound playing into Phaser
In iOS, we cannot trigger a playing sound if it does not start from a user gesture.
This is a huge bummer for a notification sound!

This is an attempt to switch sound playing to Phaser, which is using under the hood the WebAudio API.
This might solve the issue.
2021-06-03 15:40:44 +02:00
David Négrier
80a698d891 Preventing crash on iOS
On iOS, audio elements must be triggered by a user gesture.
We are catching exceptions thrown in order not to crash.

In the future, we need to find another way to play sounds.
2021-06-03 14:53:58 +02:00
David Négrier
46cd387853
Merge pull request #1107 from thecodingmachine/enableCameraSceneSafari
Fixing camera on safari iphone
2021-06-03 14:42:18 +02:00
David Négrier
ebf217057d Switching to "playsinline" attribute in the video tag (both of them) 2021-06-03 14:31:21 +02:00
David Négrier
9401662f83
Merge pull request #1105 from thecodingmachine/dependabot/npm_and_yarn/front/ws-6.2.2
Bump ws from 6.2.1 to 6.2.2 in /front
2021-06-03 14:15:38 +02:00
grégoire parant
2b13b764b4
Public texture (#1093)
* Public texture

 - Front => Get texture when user connected on public method
 - Front => Anonymous login will be make every connexion to get map details
 - Pusher => `/anonymLogin` permit to get map details and public texture load in customize scene

* Improve texture local user

- Permit to keep previous texture get with 'register' link

* Texture public loading

 - Texture will be load with Room class
 - Fix issue on lazzy loading atttempt

* Remove async await useless
2021-06-03 13:07:52 +02:00
GRL
4fd453ec05 playsinline on video 2021-06-03 12:02:58 +02:00
David Négrier
9e42d9d05b
Merge pull request #1106 from thecodingmachine/safari_fix
Fixing Safari on MacOS compatibility
2021-06-03 10:50:30 +02:00
David Négrier
5f562f49c3 Improving error message 2021-06-03 10:49:12 +02:00
David Négrier
eb6cfdf53d Fixing missing early return if webcam not available 2021-06-03 10:39:30 +02:00
GRL
8bcfc3cbee Max height on EnableCameraScene 2021-06-03 10:30:53 +02:00
kharhamel
b8ffe5038c FIX: on a touch screen, the menu emote will not open if more than one pointer is used 2021-06-03 10:22:06 +02:00
David Négrier
25f4adc7ad Fixing Safari on MacOS compatibility
The null safe operator is not recognized and was not encoded by Webpack in Svelte expressions (inside {})

+ The Notification API of Safari is old and broken and we need to account for that.
2021-06-03 10:17:38 +02:00
dependabot[bot]
918a37173e
Bump ws from 6.2.1 to 6.2.2 in /front
Bumps [ws](https://github.com/websockets/ws) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/commits)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-03 08:10:49 +00:00
GRL
304675bc74 Merge remote-tracking branch 'origin/resizeSelect' into resizeSelect 2021-06-02 18:01:42 +02:00
GRL
59d60f54fe Save zoom level in the gameScene and restore it after the SelectCharacterScene and CustomizeScene 2021-06-02 18:01:36 +02:00
David Négrier
100198b55c Using "standardized-audio-context" to fix compatibility of AudioContext with Safari. 2021-06-02 17:58:58 +02:00
David Négrier
d43633e936 Added an animation when audio message played 2021-06-02 16:52:25 +02:00
David Négrier
f4880cc1d0 Merge branch 'resizeSelect' of github.com:thecodingmachine/workadventure into resizeSelect 2021-06-02 16:48:53 +02:00
David Négrier
267d0a2cd1 Moving audio message to Svelte 2021-06-02 16:46:28 +02:00
GRL
ba038dc75a Merge remote-tracking branch 'origin/resizeSelect' into resizeSelect 2021-06-02 16:08:38 +02:00
GRL
3d9e2ad49a Save zoom level of the game and restore it when quitting the login scenes
SelectCompanionScene with zoom on mobile
2021-06-02 16:08:31 +02:00
David Négrier
faa4c7c08e Merge branch 'resizeSelect' of github.com:thecodingmachine/workadventure into resizeSelect 2021-06-02 12:27:54 +02:00
David Négrier
395d66e648 Putting grey background under video
Signed-off-by: David Négrier <d.negrier@thecodingmachine.com>
2021-06-02 12:27:46 +02:00
GRL
6fd119c199 Merge remote-tracking branch 'origin/resizeSelect' into resizeSelect 2021-06-02 12:00:50 +02:00
GRL
5bd5245044 SelectCharacterScene and CustomCharacterScene mobile version 2021-06-02 12:00:35 +02:00
David Négrier
321fc3184a Fixing scrollability of enable camera scene page 2021-06-02 10:44:36 +02:00
David Négrier
950c5ace3f Merge branch 'resizeSelect' of github.com:thecodingmachine/workadventure into resizeSelect 2021-06-02 10:14:42 +02:00
David Négrier
3f20d5b0d1 Trying to fix cam size in portrait and overflow 2021-06-02 10:14:33 +02:00
GRL
e9ec5f26aa Merge branch 'resizeSelect' of github.com:thecodingmachine/workadventure into resizeSelect 2021-06-02 09:59:44 +02:00
GRL
ea576477cd Border on videocam in enable camera scene 2021-06-02 09:58:34 +02:00
David Négrier
9e35f96ce5 Fixing absolute/relative layouts of Svelte layers 2021-06-02 09:58:00 +02:00
David Négrier
96cd097af8 Fixing cam and controls position 2021-06-02 09:09:23 +02:00
David Négrier
2230f94410 Removed unused message warning 2021-06-01 17:59:00 +02:00
David Négrier
22dff82bd3 Adding back a transition on HelpCameraSettingsPopup 2021-06-01 17:23:16 +02:00
David Négrier
9c9699d2d1 Fixing absolute positioning of Svelte scenes 2021-06-01 17:07:56 +02:00
David Négrier
b04c438d6f Detect webcams unplugged 2021-06-01 16:43:24 +02:00
GRL
9aeb18df37 correction following review by Kharhamel 2 2021-06-01 16:36:13 +02:00
GRL
5735e9da36 Merge branch 'resizeSelect' of github.com:thecodingmachine/workadventure into resizeSelect 2021-06-01 16:31:09 +02:00
GRL
cd482ef1d2 correction following review by Kharhamel 2021-06-01 16:29:49 +02:00
David Négrier
cf9467419d Fixing scene overflow 2021-06-01 16:22:39 +02:00
David Négrier
d04df35506 Merge branch 'resizeSelect' of github.com:thecodingmachine/workadventure into resizeSelect 2021-06-01 16:17:45 +02:00
David Négrier
bf7083effc Migrating EnableCameraScene to Svelte 2021-06-01 16:17:36 +02:00
GRL
2d93be519f Merge branch 'resizeSelect' of github.com:thecodingmachine/workadventure into resizeSelect 2021-06-01 11:52:55 +02:00
GRL
10e40930e2 Adding map test helpCameraSetting 2021-06-01 11:52:19 +02:00
David Négrier
c7b3e3cd44 Merge branch 'resizeSelect' of github.com:thecodingmachine/workadventure into resizeSelect 2021-06-01 11:19:56 +02:00
David Négrier
47555d5955 Migrating cam to Svelte on Camera setup screen 2021-06-01 11:19:46 +02:00
GRL
9a5300dd2d helpCameraSettingPopup in svelte with nes-css 2021-06-01 11:07:52 +02:00
David Négrier
5839e0b270 Throwing exceptions into store subscribers is wreaking havok 2021-06-01 09:17:01 +02:00
David Négrier
9063ba2a1f Removing call to removed method 2021-06-01 09:12:31 +02:00
David Négrier
59256f4cb9 Merge branch 'resizeSelect' of github.com:thecodingmachine/workadventure into resizeSelect 2021-06-01 09:09:11 +02:00
David Négrier
9d6b597552 Starting working towards migrating the help camera popup 2021-06-01 09:08:02 +02:00
GRL
ffcfb7495b Merge branch 'resizeSelect' of github.com:thecodingmachine/workadventure into resizeSelect 2021-05-31 18:06:02 +02:00
GRL
1ed881e0bf arrow up black and white colors 2021-05-31 18:05:34 +02:00
David Négrier
ce645a83ab Fixing display of terms and conditions 2021-05-31 18:02:45 +02:00
GRL
f8cbf41c3a Merge branch 'resizeSelect' of github.com:thecodingmachine/workadventure into resizeSelect 2021-05-31 17:54:07 +02:00
GRL
047337ae81 Merge branch 'resizeSelect' of github.com:thecodingmachine/workadventure into resizeSelect 2021-05-31 17:53:44 +02:00
David Négrier
11fb0aa1d8 Fixing typo 2021-05-31 17:53:27 +02:00
GRL
4923ce8b83 selectCharacterScene and customCharacterScene in svelte 2021-05-31 17:50:14 +02:00
David Négrier
cb03580421 Partial migration of EnableCameraScene to Svelte 2021-05-31 17:49:41 +02:00
David Négrier
13d3227323 Migrating LoginScene to Svelte 2021-05-31 17:03:29 +02:00
GRL
120a488121 Adding selectCompanionStore 2021-05-31 12:16:46 +02:00
GRL
b8873d1277 selectCompanionScene work with svelte 2021-05-31 12:06:11 +02:00
GRL
471ff2bb01 Merge branch 'develop' of github.com:thecodingmachine/workadventure into resizeSelect 2021-05-31 10:21:15 +02:00
GRL
1ac108a9b8 correction of resize select character and companion by David 2021-05-31 10:20:48 +02:00
_Bastler
e43fe7cebd fix action+add html 2021-05-30 20:00:41 +02:00
_Bastler
85c9393962 merged latest dev 2021-05-30 15:29:28 +02:00
David Négrier
90176da888 MediaManager cleanup
- Removing the last reference to the local video stream. Everything is now fetched from the store.
- Remvoing commented code
2021-05-29 22:34:38 +02:00
David Négrier
4077db37e3
Merge pull request #1091 from thecodingmachine/fixing_button_style
Fixing buttons design
2021-05-29 22:08:54 +02:00
David Négrier
588e5566d0 Fixing buttons design
Fixing the color of camera/microphone/screen sharing buttons that was broken following the migration to Svelte
2021-05-29 22:05:47 +02:00
David Négrier
b7f1461405 Removing listeners from MediaManager.
SimplePeer now reacts only to stores.
2021-05-29 22:04:08 +02:00
David Négrier
5295f923b5
Merge pull request #1086 from thecodingmachine/camera_controls_in_svelte
Switching Camera controls in Svelte
2021-05-28 18:16:51 +02:00
kharhamel
679b5b6b79 FIX: better error text in LoginScene 2021-05-28 17:51:18 +02:00
David Négrier
b3aa8975e9 Switching the video feedback in Svelte 2021-05-28 16:20:02 +02:00
_Bastler
de02580ac8 merge latest dev 2021-05-28 15:53:27 +02:00
_Bastler
76f35acc17 update 2021-05-28 15:46:25 +02:00
dependabot[bot]
ee3097e6b0
Bump dns-packet from 1.3.1 to 1.3.4 in /front
Bumps [dns-packet](https://github.com/mafintosh/dns-packet) from 1.3.1 to 1.3.4.
- [Release notes](https://github.com/mafintosh/dns-packet/releases)
- [Changelog](https://github.com/mafintosh/dns-packet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mafintosh/dns-packet/compare/v1.3.1...v1.3.4)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-28 13:41:07 +00:00
kharhamel
12da6ddd6c FEATURE: improved the display of player names, with the font-family 'Press start 2P' and gray outlines 2021-05-28 15:33:10 +02:00
_Bastler
ae67f43a7e add iro 2021-05-28 13:57:00 +02:00
jonny
ed39043bbe this should make one file only 2021-05-28 13:10:30 +02:00
GRL
276b404dd9 Merge remote-tracking branch 'origin/metadataScriptingApi' into metadataScriptingApi 2021-05-28 12:13:25 +02:00
GRL
858a513569 correction of adding custom menu
correction of setProperty
updating CHANGELOG
updating api-reference
2021-05-28 12:13:10 +02:00
David Négrier
d1c22b122c Improving icons centering 2021-05-28 10:48:24 +02:00
David Négrier
cc1eab653a Fixing screen sharing button display 2021-05-28 10:48:13 +02:00
David Négrier
4b77e8c577 Switching Camera controls in Svelte
Moving Camera controls out of HTML + MediaManager and into Svelte components
2021-05-28 09:31:04 +02:00
jonny
8a1376e966 refactored to key based types 2021-05-28 02:28:11 +02:00
jonny
dbb35d102f extracted giant typing block 2021-05-28 01:59:43 +02:00
jonny
5fd82c1188 minor cleanup 2021-05-28 01:50:58 +02:00
jonny
ab631c5dc4 register callbacks
should be done now
2021-05-28 01:46:08 +02:00
jonny
9e6fb755d9 added javascript for setting commands 2021-05-28 01:44:38 +02:00
jonny
fd5b598b63 Bubble [WIP] (still need to do the javascript part) 2021-05-28 01:18:00 +02:00
jonny
540e5783b6 cowebsite
navigation
sound
player
extraction
2021-05-28 01:14:10 +02:00
jonny
ea04dd5303 Merge branch 'iframe-api-refactor' of github.com:jonnytest1/workadventure into iframe-api-refactor 2021-05-28 00:58:11 +02:00
jonny
6a90655c44 Merge branch 'develop' of https://github.com/thecodingmachine/workadventure into iframe-api-refactor 2021-05-28 00:52:42 +02:00
jonnytest1
b35207a578
Merge branch 'develop' into iframe-api-refactor 2021-05-28 00:38:12 +02:00
jonny
cbe93d7164 [WIP] fixed cherry pick conflicts 2021-05-28 00:34:40 +02:00
jonny
2de2d114a1 added typedef for subobject types
extracted popup functions

# Conflicts:
#	front/package-lock.json
#	front/package.json
#	front/src/iframe_api.ts
2021-05-28 00:30:51 +02:00
jonny
1a1ab30574 extraction idea
# Conflicts:
#	front/src/Api/ScriptUtils.ts
#	front/src/iframe_api.ts
2021-05-28 00:29:21 +02:00
David Négrier
5d8d729bd7 Uncommenting action 2021-05-27 18:25:27 +02:00
GRL
6dcb0d3750 first step to change tile 2021-05-27 17:06:39 +02:00
GRL
9cd3ff1d31 Merge branch 'correct-merge' into metadataScriptAPIV2 2021-05-27 10:16:00 +02:00
GRL
acbe4f89a6 Merge branch 'update-game-tiles' into correct-merge 2021-05-27 09:45:25 +02:00
_Bastler
05e18e0568 merge betterNameText 2021-05-26 20:31:33 +02:00
_Bastler
7bdbc191b5 merge latest dev 2021-05-26 19:14:18 +02:00
_Bastler
7e07279c88 character hotifxes 2021-05-26 18:46:25 +02:00
GRL
5565ddd3f4 Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi 2021-05-26 17:22:37 +02:00
David Négrier
870f16f9c6 Merge branch 'develop' of github.com:thecodingmachine/workadventure into SoundInMapScript 2021-05-26 16:15:33 +02:00
David Négrier
54e300443b Fixing Typing 2021-05-26 16:11:22 +02:00
David Négrier
fac6574cb5 Removing console.log and unused files 2021-05-26 16:08:43 +02:00
David Négrier
6d15921674 Fixing screen-sharing button not hidden anymore when hovering button 2021-05-26 12:30:56 +02:00
David Négrier
4f1cab5afe Fixing comments 2021-05-26 12:19:58 +02:00
David Négrier
4c4f310b79 The share screen button is now displayed only when screen sharing makes sense.
Also, fixed the button not aligned bug
2021-05-26 12:12:47 +02:00
David Négrier
dd428bc1e1 Migrating screen sharing to using a store 2021-05-26 12:12:47 +02:00
David Négrier
d32df13f1b Camera now show up when someone is moving and hides 5 seconds after we stop moving.
Also, added an animation to show/hide the webcam.
2021-05-26 12:12:46 +02:00
David Négrier
8af8ccd54b Migrating MediaManager game part to Svelte store 2021-05-26 12:12:18 +02:00
David Négrier
28d78a7988 Switching MediaManager to using a Svelte store
This allows cleaner and more expressive code, especially regarding whether the webcam should be on or off.
2021-05-26 12:11:16 +02:00
David Négrier
4f4d2532b7
Merge pull request #1082 from thecodingmachine/disabling_physics_optim
Moving Physics optim to DirtyScene
2021-05-26 12:08:57 +02:00
David Négrier
bc19cbd525 Moving Physics optim to DirtyScene
The Physics engine is now disabled only if no sprites are moving (if they have no velocity).
Also, if a sprite is moving (if it has a velocity), the dirty state is set.
2021-05-26 12:00:27 +02:00
GRL
17261dfab6 Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi 2021-05-26 10:58:25 +02:00
GRL
c8e2416e08 documentation of getCurrentUser, getCurrentRoom and on working with group layer 2021-05-26 10:41:33 +02:00
GRL
b4fa38bf8c Merge remote-tracking branch 'origin/metadataScriptingApi' into metadataScriptingApi 2021-05-25 17:21:12 +02:00
GRL
a5cb93541a correction from code review 2021-05-25 17:21:02 +02:00
kharhamel
595c5ca64d now use custom emotes with tweens instead of transistions 2021-05-25 16:37:24 +02:00
GRL78
7c44d747de
Apply suggestions from code review
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
2021-05-25 11:02:25 +02:00
GRL
d4bc999c54 pause loading tileset on fly 2021-05-25 10:15:56 +02:00
GRL
36f0cd1a23 Revert "pause for loading tileset on the fly"
This reverts commit a3165a0540.
2021-05-25 10:11:27 +02:00
GRL
343ad6ea96 Revert "preparation for merge with metadataScriptApi"
This reverts commit b18b2fe0e3.
2021-05-25 10:11:25 +02:00
GRL
a7b09e91ba Revert "Merge branch 'update-game-tiles' into metadataScriptingApi"
This reverts commit 428625e61b, reversing
changes made to a3165a0540.
2021-05-25 10:09:58 +02:00
GRL
428625e61b Merge branch 'update-game-tiles' into metadataScriptingApi 2021-05-25 09:54:00 +02:00
GRL
b18b2fe0e3 preparation for merge with metadataScriptApi 2021-05-25 09:50:59 +02:00
GRL
a3165a0540 pause for loading tileset on the fly 2021-05-25 09:39:04 +02:00
GRL
d0aaa0620d Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi 2021-05-25 09:24:26 +02:00
DESKTOP-FMM8UI0\CLV
0c3b9ccfbf Merge branch 'develop' of https://github.com/thecodingmachine/workadventure into SoundInMapScript
# Conflicts:
#	front/src/Api/IframeListener.ts
#	front/src/Phaser/Game/GameScene.ts
#	front/src/iframe_api.ts
#	maps/Tuto/scriptTuto.js
#	maps/Village/Village.json
2021-05-21 17:45:26 +02:00
GRL
1110f4fb7f Revert "Merge branch 'update-game-tiles' into metadataScriptingApi"
This reverts commit 796a9418d3, reversing
changes made to 3506063e65.
2021-05-21 16:24:48 +02:00
GRL
796a9418d3 Merge branch 'update-game-tiles' into metadataScriptingApi 2021-05-21 15:56:35 +02:00
GRL
3506063e65 first step on loading a tileset from a script 2021-05-20 17:09:10 +02:00
GRL
2f9cc393a7 Implementation of getTag of the current user
documentation of getTag
Adding map for test of getTag
2021-05-20 10:57:36 +02:00
kharhamel
d93b30f982 improved radial menu 2021-05-19 18:11:51 +02:00
kharhamel
35b37a6a88 Added a radial menu to run emotes 2021-05-19 15:17:50 +02:00
kharhamel
a1d52b4265 FEATURE: added the possibility toplay emotes 2021-05-19 15:17:03 +02:00
GRL
ce0a72c6ce Merge branch 'menu-command-api' of github.com:jonnytest1/workadventure into metadataScriptingApi 2021-05-19 09:36:11 +02:00
GRL
b509471140 documentation
documentation of onPlayerMove
documentation of getMap
documentation of getGameState
2021-05-18 17:05:16 +02:00
_Bastler
aa0e3d5190 fix html 2021-05-18 16:02:51 +02:00
GRL
aa78bf44ef implementation of DataLayerEvent
update GetGameState to add nickname to the returned data
update GameMap to separate phaserLayer and mapLayer
2021-05-18 15:41:16 +02:00
_Bastler
f2d8035abe fix z-index 2021-05-18 15:29:23 +02:00
GRL
201fcf6afa Merge branch 'gamestate-api-read' of github.com:jonnytest1/workadventure into metadataScriptingApi 2021-05-18 15:18:35 +02:00
_Bastler
5538a511c7 merge latest dev 2021-05-18 15:04:35 +02:00
GRL
2ee62c9e9e Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi 2021-05-18 11:50:03 +02:00
kharhamel
20ec609535 FIX: rejected map axios promises are now catched 2021-05-18 11:45:07 +02:00
GRL
3edfd5b285 GameState is now save in cache
HasPlayerMoved is send when the player is actually moving on the map every 200ms.
2021-05-18 11:33:16 +02:00
David Négrier
2ea731beeb
Merge pull request #1057 from thecodingmachine/physics_flag
Making sure Physics is not enabled several times
2021-05-18 10:26:32 +02:00
David Négrier
c9eb5691b5
Merge pull request #1045 from thecodingmachine/svelte
Installing Svelte in front container
2021-05-18 10:25:54 +02:00
David Négrier
127a4759ac Merge branch 'develop' of github.com:thecodingmachine/workadventure into menu-command-api
# Conflicts:
#	front/src/Api/Events/IframeEvent.ts
#	front/src/Api/IframeListener.ts
#	front/src/iframe_api.ts
2021-05-18 10:16:44 +02:00
_Bastler
d133bf17ea Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-05-18 09:54:08 +02:00
David Négrier
9b68faac0e
Fixing JSDoc 2021-05-18 09:53:54 +02:00
David Négrier
6128f1e431 Making sure Physics is not enabled several times
As part of an energy saving measure, we started disabling physics when the character is not moving and enabling physics again only when the character moves.
However, we enabled Physics on each frame the characeter was moving.
As a result, the Physics system would run several times, slowly slowing the computer down.

This fixes this issue by adding a flag to only enable Physics once.
2021-05-18 09:42:01 +02:00
David Négrier
24dfa2703d Set a global dirty flag on resize
This adds a global "Dirty" flag at the Game level and sets it each time the ScaleManager is modified.
This fixes a bug where the game was not redrawn when a CoWebsite was opening/closing.
2021-05-18 09:20:38 +02:00
_Bastler
777987600f update 2021-05-18 07:58:47 +02:00
_Bastler
bfb6b118cd Merge remote-tracking branch 'origin/develop' into dev_main_merge 2021-05-17 17:18:08 +02:00
David Négrier
54e9e5656b Commenting menu display (for now) 2021-05-17 16:50:35 +02:00
David Négrier
00dd5a8c84 Fixing Yarn 2021-05-17 16:45:52 +02:00
David Négrier
7cc1e5b2c6 Moving styles out of the "dist/" directory 2021-05-17 16:41:40 +02:00
David Négrier
79935593e2 Adding fork-ts-checker-webpack-plugin
This allows offloading type checking to another process and saves ~1-2 seconds for each build.
Also, we can integrate ESLint into the build pipeline and this is dope!
2021-05-17 16:41:38 +02:00
David Négrier
6e7f8507b1 Removing custom stats 2021-05-17 16:41:10 +02:00
David Négrier
849e68ece2 Optimizing build time + inline small files into CSS 2021-05-17 16:41:10 +02:00
David Négrier
db40681be7 Code cleanup 2021-05-17 16:41:10 +02:00
David Négrier
9c4c6f2d53 Fixing Jasmine tests 2021-05-17 16:41:10 +02:00
David Négrier
5cb58d98a0 Adding correct SCSS file integration with Svelte 2021-05-17 16:41:09 +02:00
David Négrier
1885ea42a4 First working example with Svelte (the menu icon shows up on entering the game) 2021-05-17 16:39:56 +02:00
David Négrier
62cc1f73ca Tryig to fix webpack for Svelte 2021-05-17 16:39:56 +02:00
David Négrier
9bc79c3ed3 Adding Svelte to the project 2021-05-17 16:39:55 +02:00
kharhamel
f2dca82642 FIX: webpack config NodePolyfillPlugin 2021-05-17 16:30:19 +02:00
_Bastler
6d1b82974d Merge branch 'develop' of github.com:thecodingmachine/workadventure into dev_main_merge 2021-05-17 16:17:50 +02:00
kharhamel
a66d42e158 FEATURE: we now allow a global zoom level of 1.5 2021-05-17 16:11:38 +02:00
_Bastler
d03f277061 Merge branch 'develop' of github.com:thecodingmachine/workadventure into dev_main_merge 2021-05-17 15:25:11 +02:00
_Bastler
cad36a7e40 updates 2021-05-17 15:24:56 +02:00
_Bastler
16aa859844 merge develop into main 2021-05-17 14:49:18 +02:00
kharhamel
a23e72454d FEATURE: added the env variable DISABLE_DIRTY_CHECKS 2021-05-17 14:47:34 +02:00
_Bastler
aac5676765 hotfix 2021-05-17 12:50:15 +02:00
kharhamel
1466d7481c FIX: fixed an error in webpack config 2021-05-17 12:20:07 +02:00
_Bastler
3e66a541e3 add website focus overlay 2021-05-16 18:48:48 +02:00
_Bastler
6ebec9ce68 add exitUrl script 2021-05-16 14:52:07 +02:00
_Bastler
c7623300f2 add input popup 2021-05-16 14:04:45 +02:00
_Bastler
c6eee39057 cowebsite 2021-05-16 10:50:57 +02:00
_Bastler
f5d0c27193 fix cowebsite 2021-05-16 10:42:05 +02:00
_Bastler
b4fc8c6d27 Added discussion scripting 2021-05-16 10:22:05 +02:00
_Bastler
9c392856eb Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2021-05-15 18:57:25 +02:00
_Bastler
e7727e122e storage + nes.css 2021-05-14 16:41:41 +02:00
_Bastler
d6e99d5f4d fix overlay + typing focus 2021-05-14 11:59:38 +02:00
David Négrier
fe573893a1
Merge pull request #1039 from thecodingmachine/importsNotUsedAsValues
Setting "importsNotUsedAsValues": "error"
2021-05-13 19:43:34 +02:00
_Bastler
19a56f9d3b fix joystick 2021-05-13 19:07:04 +02:00
_Bastler
e329c39741 fix perfomance 2021-05-13 15:56:51 +02:00
_Bastler
1f5af5199d animated tiles 2021-05-13 15:24:35 +02:00
_Bastler
6e9b2e8d31 merge develop, add animated tiles 2021-05-13 15:09:02 +02:00
GRL
43aad4ab14 phaserLayers managed by Gamemap
Implementation of LayersFlattener
Implementation of Setting properties of a layer form script
Update show/hide layer form script
Update unit test of LayersIteratorTest
2021-05-12 14:30:12 +02:00
David Négrier
4fcbc146ca Switching the Webpack configuration file to Typescript
This switches the Webpack config file from JS to Typescript.
2021-05-12 13:38:32 +02:00
David Négrier
06058cfc24 Upgrading Typescript target from ES2015 to ES2017. 2021-05-12 11:45:01 +02:00
David Négrier
664a5b6b91 Upgrading ESLint (and ignoring a bunch of interesting rules) 2021-05-12 11:44:41 +02:00
David Négrier
f57c01dee8 Refactoring Webpack files to remove prod file. The prod file is now inferred from the NODE_ENV variable. 2021-05-12 11:28:21 +02:00
David Négrier
8c1e01566a Upgrading all dependencies in front
Upgrading to Webpack 5, Typescript 4, ...
2021-05-12 10:35:14 +02:00
David Négrier
4d4f845b9e Setting "importsNotUsedAsValues": "error"
Turning the "importsNotUsedAsValues" TS config value to "error".
This will require us to use `import type` instead of `import` when we are importing a value that is only used as a type (and therefore that is dropped by the Typescript compiler).

Why this change?
This is a requirement to be able to use Svelte in the future. See https://github.com/sveltejs/svelte-preprocess/issues/206#issuecomment-663193798
2021-05-12 09:13:25 +02:00
_Bastler
e9baef5963 merge 2021-05-11 20:18:12 +02:00
TabascoEye
2d8997c6d7 turning noise suppresion back on
turning AGC off was a good idea, disabling noise suppresion with it was not.
=> should all end up in the "settings" menu in the end
2021-05-11 18:14:42 +02:00
TabascoEye
627db30410
turning noise suppresion back on
turning AGC off was a good idea, disabling noise suppresion with it was not.
=> should all end up in the "settings" menu in the end
2021-05-11 17:38:28 +02:00
David Négrier
d2b122efe5
Merge pull request #1035 from thecodingmachine/improveDirtyScene
FIX: trackDirtyAnims now listen to more generic events
2021-05-11 17:08:29 +02:00
kharhamel
4ec5ad9e33 FIX: trackDirtyAnims now listen to more generic events 2021-05-11 16:44:31 +02:00
David Négrier
0c279750be Merge branch 'master' of github.com:thecodingmachine/workadventure into develop
# Conflicts:
#	front/src/Phaser/Game/GameScene.ts
2021-05-11 16:43:34 +02:00
_Bastler
8c3216dd3d Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2021-05-11 14:53:24 +02:00
David Négrier
ad39b43df3 Closing game webcame in Jitsi
When stepping in Jitsi, the game webcam (from mediaManager) was not shut down.
And when enabling/disabling the webcam in Jitsi, the webcam in mediaManager was also
enabled/disabled. This PR fixes those issues.

It also fixes a race condition when closing a Jitsi where the mic/cam would be enabled at the same time.
2021-05-11 14:52:51 +02:00
Kharhamel
78d4985d10
Merge pull request #1028 from thecodingmachine/fixOnMapExit
FIX: triggering a map transition now ignores other map transitions for 500ms
2021-05-11 14:21:06 +02:00
_Bastler
e42e1f36b4 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2021-05-11 12:01:25 +02:00
kharhamel
f044b3d249 FIX: triggering a map transition now ignores other map transitions for 500ms 2021-05-11 11:05:05 +02:00
David Négrier
23bf78a026 Refactoring code to use the "visibilitychange" event
Using the "visiblitychange" event instead of relying on a "trick" related to RAF being disabled when a window is not open allows us to have cleaner code.
Bonus: the recursive call to "setTimeout" is gone, so the stacktrace growing indefinitely is gone too.
This should make the application a bit more stable.
2021-05-11 10:56:50 +02:00
Gregoire Parant
e50aad0ea0 Add WA logo 2021-05-11 10:13:50 +02:00
Gregoire Parant
52b1c6733b Notification & Camera
- Notification when user is first and not focus on the tab
- Camera focus when user is in discussion circle and back on tab with previous config camera settings
- Camera stay blur if user is in discussion circle and not back on the tab

# Conflicts:
#	front/src/WebRtc/MediaManager.ts
2021-05-11 10:13:38 +02:00
jonny
8cef4f6e90 Merge remote-tracking branch 'remotes/workadventure-main/develop' into gamestate-api-read
# Conflicts:
#	front/src/Api/IframeListener.ts
2021-05-10 21:48:11 +02:00
jonny
2c4c98b0e5 limited event trigger to max 10 per second 2021-05-10 21:44:15 +02:00
jonny
8e136cebe8 added callback on playermove - gets quite delayed after walking for a few seconds 2021-05-10 21:27:17 +02:00
_Bastler
5bd56d00f3 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2021-05-10 20:52:57 +02:00
grégoire parant
0fd743bcac
HotFix sound meter (#1029) 2021-05-10 20:49:17 +02:00
grégoire parant
bd4cf5d7f7
Fix error context sound meter (#1009) 2021-05-10 19:55:43 +02:00
David Négrier
0411d5e493 Fixing "camera popup" always display on resize
This fixes a bug where the "camera popup" window was always displayed when the screen was resized.
2021-05-10 19:05:01 +02:00
GRL
fd931c4884 Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi 2021-05-10 14:45:41 +02:00
David Négrier
c025d1798b Renaming restorePlayerControls/disablePlayerControls
Putting "controls" in the plural form:

- restorePlayerControl => restorePlayerControls
- disablePlayerControl => disablePlayerControls
2021-05-10 12:18:06 +02:00
GRL
cd2d090a8b Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi 2021-05-10 11:46:16 +02:00
GRL
841bf29764 auto update show/hide layer 2021-05-10 11:20:07 +02:00
GRL
a6ba8d41b9 implement show/hide layer with scripting 2021-05-10 11:19:18 +02:00
_Bastler
2234abb8b9 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2021-05-10 10:10:58 +02:00
jonny
ce0c7ea3eb Merge remote-tracking branch 'remotes/workadventure-main/develop' into gamestate-api-read 2021-05-10 10:01:53 +02:00
jonny
a5260c0831 Merge remote-tracking branch 'remotes/workadventure-main/develop' into load-page-api 2021-05-10 09:58:59 +02:00
jonny
4758820aa4 Merge remote-tracking branch 'remotes/workadventure-main/develop' into menu-command-api 2021-05-10 09:54:39 +02:00
jonny
46996f7049 moved event trigger out of index array 2021-05-10 01:34:33 +02:00
jonny
8db72d2dfd refactored to Array of tile 2021-05-10 01:34:32 +02:00
jonny
bed45a8310 cherry pick conflicts 2021-05-10 00:31:54 +02:00
jonny
ffe03d40f5 option to update tile
# Conflicts:
#	front/src/Api/Events/ApiUpdateTileEvent.ts
#	front/src/Api/IframeListener.ts
#	front/src/Phaser/Game/GameScene.ts
2021-05-10 00:30:32 +02:00
jonny
91148035ec polyfill generic message event 2021-05-09 21:46:40 +02:00
jonny
cf06f29ef8 fixed cherry pick conflicts 2021-05-09 21:38:11 +02:00
jonny
8da5bf9f8e typed iframe api events
# Conflicts:
#	front/src/Api/IframeListener.ts
#	front/src/iframe_api.ts
2021-05-09 21:36:48 +02:00
_Bastler
deac58ebc7 merge into develop 2021-05-08 20:05:08 +02:00
jonnytest1
2922ae4603
Merge branch 'develop' into menu-command-api 2021-05-07 19:59:58 +02:00
DESKTOP-FMM8UI0\CLV
e655edd9bd export class Popup and Soud of Iframe Api
let become const in SoundManager
2021-05-07 17:03:07 +02:00
David Négrier
5605e63e5f
Merge pull request #998 from thecodingmachine/skiprender2
Skip "render" if nothing changed on screen (2)
2021-05-07 15:44:08 +02:00
Gregoire Parant
62a6eabc88 Merge branch 'master' into develop 2021-05-07 00:07:43 +02:00
grégoire parant
0e32238505
HotFix custom WOKA (#999) 2021-05-06 19:58:08 +02:00
David Négrier
6b4d064f19 Merge branch 'develop' of github.com:thecodingmachine/workadventure into skiprender2
# Conflicts:
#	front/src/Phaser/Game/GameScene.ts
#	front/src/index.ts
2021-05-06 16:25:13 +02:00
David Négrier
189dba2e21 Fixing memory leak when switching scenes 2021-05-06 15:38:24 +02:00
David Négrier
3b5f105daf Setting the dirty state automatically when there is an animation frame 2021-05-06 15:38:22 +02:00
David Négrier
6d3cbc573c Instruct systems with 2 GPUs to use the low power GPU (to save battery) 2021-05-06 15:36:49 +02:00
David Négrier
0c5e5ef578 Skip "render" if nothing changed on screen
For each requested animation frame (RAF) in Phaser, Phaser calls the "update" method, then the "render" method of each scenes.
The "render" method takes some time (and energy) to perform the rendering.

The fact is we probably don't need to call "render" if nothing changed on the screen (which happens most of the frames in a typical WorkAdventure game).

This commit is therefore overloading the "Game" class of Phaser to add a "dirty" flag.

Scenes can now add a "isDirty()" method. If all displayed scenes are pristine (not dirty), Phaser will skip rendering the frame altogether.

This saves "a lot" of energy, resulting in laptops that are not overheating when using WorkAdventure \o/
2021-05-06 15:36:45 +02:00
David Négrier
271300aa8d
Merge pull request #982 from jonnytest1/baseUrlFix
fixed url cannot be relative
2021-05-06 15:09:13 +02:00
jonny
a24ca078e6 use iframe url if no script
# Conflicts:
#	front/src/Api/IframeListener.ts
2021-05-05 19:15:32 +02:00
David Négrier
fea1de36a4
Merge pull request #974 from tabascoeye/patch-1
allow numbers in nickname again
2021-05-05 18:44:01 +02:00
David Négrier
3751b0e2bc Removing RESOLUTION and ZOOM_LEVEL settings: they are no more needed or supported 2021-05-05 17:11:03 +02:00
David Négrier
7ae66a63a4 Refactoring centering of DOM elements 2021-05-05 17:10:39 +02:00
David Négrier
04448c3c50 Fixing button position in webcam setting page 2021-05-05 15:46:02 +02:00
David Négrier
cd2873e9d3 Fixing CI 2021-05-05 13:14:00 +02:00
David Négrier
bede7abdd8 Removing mousewheel to up down plugin 2021-05-05 12:15:13 +02:00
David Négrier
10bd073b7d Fixing center computation of popup 2021-05-05 12:12:56 +02:00
David Négrier
7d2cc66f11 Fixing pointer-events interaction preventing virtual joystick from working 2021-05-05 11:56:24 +02:00