_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,611 Commits 2 Branches 0 Tags 47 MiB
bceb5ba74d
Commit Graph

513 Commits

Author SHA1 Message Date
_Bastler
e43e1d8463 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-11-16 10:56:33 +01:00
_Bastler
72e7f1bdd5 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-11-10 19:31:44 +01:00
Alexis Faizeau
1c48feeb61 Add iconserver in services 2021-11-10 16:46:13 +01:00
_Bastler
af855344f4 redo message trigger for co-websites 2021-11-03 17:30:13 +01:00
_Bastler
a3937fc17f Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-11-03 11:21:41 +01:00
Alexis Faizeau
5a3d510f05 Create GameMapProperties index 2021-11-02 10:52:25 +01:00
_Bastler
6ed4a9bdc5 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-29 19:57:47 +02:00
Alexis Faizeau
e216b6caf4 Handle landscape mobile with cowebsite 2021-10-29 15:23:09 +02:00
_Bastler
7fb13cf54b santitize, popup class 2021-10-28 19:15:02 +02:00
Alexis Faizeau
ab1a9b358a Change favicon snatcher http to https 2021-10-26 14:16:00 +02:00
Alexis Faizeau
fbff7491df Zoom x 2 thumbnail cowebsite 2021-10-25 19:00:26 +02:00
Alexis Faizeau
f84c4b3276 Refacto insert cowebsite 2021-10-25 19:00:26 +02:00
Alexis Faizeau
b81b1ff68b Implement new cowbesite system on API 2021-10-25 19:00:26 +02:00
Alexis Faizeau
da8cc661b7 Implement the new co website system 2021-10-25 19:00:26 +02:00
_Bastler
3b4cf0a68c Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-21 21:10:09 +02:00
_Bastler
cf69b3259a Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-14 08:17:37 +02:00
David Négrier
f92b728a8e Fixing broken chat API 2021-09-13 14:50:02 +02:00
_Bastler
90f7258c9a Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-10 17:14:59 +02:00
Kharhamel
d071f5fa90 FIX: the video element should not have a bigger height than its container 2021-09-10 16:04:15 +02:00
_Bastler
bfc476fedd Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-08 10:03:13 +02:00
kharhamel
fa9929757d FIX: reimplemented the old stream behavior on bad navigators like chrome 2021-09-07 16:39:44 +02:00
_Bastler
64613b076e Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-06 18:49:47 +02:00
_Bastler
f320184d23 latest dev 2021-09-06 18:36:31 +02:00
kharhamel
4160235b92 ran pretty on the front 2021-09-06 14:31:59 +02:00
Gregoire Parant
f2ca021740 Hotfix media constraint error 
- Create error to manage displayed warning when we try to access on media with no constraint video and audio
 - Fix disabled microphone if we try to active and we don't have right or there is an error.

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-09-05 19:36:57 +02:00
_Bastler
22ff1cc82e Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-03 19:31:40 +02:00
kharhamel
ba5fa06306 FIX: fixed a circular dependancy in stores by rewriting createPeerStore() and createScreenSharingPeerStore() 2021-09-03 17:16:31 +02:00
_Bastler
62e164de9e Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-02 19:18:25 +02:00
Kharhamel
8d2da6bdc7
Merge pull request #1405 from jonnytest1/opentab2 
openTabPropertyKey (create new props in own file)
 2021-09-02 17:19:20 +02:00
_Bastler
8715781bbd Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-01 19:24:26 +02:00
jonny
181232c1e6 added jitsiTypes 2021-09-01 17:55:23 +02:00
Kharhamel
095a486621
Merge pull request #1402 from thecodingmachine/betterMEdiaStore 
FEATURE: improved the mediaStore code to disable tracks instead of deleting them
 2021-09-01 17:30:59 +02:00
kharhamel
52fe79df47 FEATURE: improved the mediaStore code to disable tracks instead of deleting them 2021-09-01 17:14:05 +02:00
_Bastler
29b790ec32 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-01 14:58:52 +02:00
jonny
0272e4f691 merged in develop again 2021-09-01 14:55:29 +02:00
Kharhamel
ad60993b9a
Merge pull request #1398 from tabascoeye/develop 
add possibility to set size of coWebsite and Jitsis via map property
 2021-09-01 14:42:41 +02:00
_Bastler
8ab4b5b80c Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-08-31 21:02:33 +02:00
kharhamel
1e20466f74 FIX: media tracks were not readded to a 3rd person in some situations 2021-08-31 16:29:23 +02:00
TabascoEye
a0d73f27d9
Update CoWebsiteManager.ts 
yet another typo
 2021-08-30 19:51:14 +02:00
TabascoEye
e6ae343975
Update CoWebsiteManager.ts 
typos and style
 2021-08-30 19:44:50 +02:00
¯\_(ツ)_/¯
ae3e2a09d9 add possibility to set size of coWebsite and Jitsis via map property 2021-08-30 19:32:02 +02:00
_Bastler
e806325da9 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-08-27 10:40:30 +02:00
GRL78
7c956d1481
REVIEW : Migration Menu and Report Menu in Svelte (#1363) 
* WIP: svelte menu

* temp

* temp

* New menu svelte

* Migration of report menu in svelte

* Migration of registerCustomMenu for Menu in Svelte
Refactor subMenuStore
Suppression of old MenuScene and ReportMenu

* Suppression of HTML files that aren't use anymore

* fix deeployer

* First pass on css

* First pass on css

* Second pass on css and reportMenu

* Second pass on css and reportMenu

* Second pass on css and reportMenu

* Third pass on css and reportMenu

* Correction following test

* Contact page only if environment variable exist

* Update service worker

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Change requested

* Change requested

Co-authored-by: kharhamel <oognic@gmail.com>
Co-authored-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-08-26 12:01:07 +02:00
_Bastler
f0a60d3907 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-08-24 11:50:11 +02:00
Gregoire Parant
99a9b5f9a2 Update strategy to use css 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-08-23 10:20:48 +02:00
Gregoire Parant
8c4ead8421 Add "\n\r" to match 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-08-23 09:43:43 +02:00
Gregoire Parant
da00fa7868 Update escapeHtml 
Update escapeHtml in HtmlUtils class to create paragraphe when user have \r\n in popup text

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-08-23 09:16:22 +02:00
_Bastler
9c7c1e091a Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-08-11 12:10:44 +02:00
grégoire parant
c7fdfed00c
Improve mobile camera shown (#1354) 
- Add new store to send mobile size
 - Update style to show video for mobile size
 2021-08-10 22:35:26 +02:00
_Bastler
27d331ea37 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-08-10 10:25:24 +02:00
Gregoire Parant
af613f5b5b Merge branch 'master' into develop 2021-08-06 15:53:33 +02:00
GRL78
e0fb31fc58
WIP: Migrate AudioManager in Svelte (#1325) 
* Migrate AudioManager in Svelte

* use import type when needed
 2021-08-06 09:11:17 +02:00
_Bastler
e9e96c9e30 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-08-05 20:46:42 +02:00
David Négrier
87e4367455 Refactoring layoutManagerActionStore. It now supports an uuid field. 
layoutManagerVisibilityStore is now a derived field from layoutManagerActionStore.
 2021-08-05 11:19:28 +02:00
Gregoire Parant
190007a21f Fix joystick postion 
- Aply new size after open and close iframe and permit to keep the good position of the joystick on the WorkAdventure screen
 2021-08-04 18:07:04 +02:00
GRL
1436b15328 Migrate layoutManager in Svelte 2021-08-03 11:13:08 +02:00
_Bastler
b2d1ace0ea Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-28 13:25:26 +02:00
Gregoire Parant
4b4356e7ff Merge branch 'master' into develop 2021-07-28 12:37:14 +02:00
_Bastler
3c52bb3dd4 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-28 08:25:52 +02:00
Stefan Weil
64065b2798
Fix some typos (found by codespell) (#1316) 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2021-07-27 14:29:09 +02:00
GRL78
95af568653
Link will now be white and underline + Click on the game to lose focus of input field (#1315) 
* Link will now be white and underline
Click on the game to lose focus of input field

* Use bind:this instead of querySelector
Add isClickedInside and isClickedOutside to HtmlUtils to know if the user click inside/outside an element targeted
 2021-07-27 14:28:35 +02:00
_Bastler
b3b99d1a55 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-22 14:53:32 +02:00
David Négrier
f435cecfdc Merge branch 'develop' of github.com:thecodingmachine/workadventure into scripting_api_room_metadata 2021-07-21 15:37:53 +02:00
_Bastler
1054f6e0fa Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-16 18:11:06 +02:00
kharhamel
f840034d9c FEATURE: chat tweak 2021-07-16 14:25:59 +02:00
David Négrier
5c7ea7b258 Merge branch 'develop' of github.com:thecodingmachine/workadventure into scripting_api_room_metadata 2021-07-16 11:22:36 +02:00
_Bastler
c390615dd4 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-16 08:33:40 +02:00
kharhamel
285079cae2 FIX: VideoPeer destroy could be called twice 2021-07-15 16:31:43 +02:00
kharhamel
18a65651f3 FIX: media box should always have a height 2021-07-15 16:08:37 +02:00
_Bastler
b9e8c970f2 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-14 19:36:16 +02:00
kharhamel
3983d0c5bc FEATURE: improved the notification system 2021-07-13 16:54:11 +02:00
_Bastler
304c3e8906 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-13 16:48:34 +02:00
Kharhamel
41a1f56bd5
Merge pull request #1111 from thecodingmachine/svelteChat 
FEATURE: migrated the chat window to svelte
 2021-07-13 11:25:38 +02:00
GRL
b9a2433283 Upgrade graphic of the chat 2021-07-12 11:59:05 +02:00
_Bastler
bcab6ae1f1 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-08 08:20:42 +02:00
kharhamel
3cfbcc6b02 FEATURE: migrated the chat window to svelte 2021-07-07 18:07:58 +02:00
grégoire parant
17525e1e15
Return at the new line into the Pop-up (#1267) 
Add regex to replace "\r\n" or "\r" or "\n" by <br/>
 2021-07-07 16:42:26 +02:00
_Bastler
303aef3e68 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-07 12:20:28 +02:00
David Négrier
34cb0ebf39 Users blocking now rely on UUID rather than ID 
This way, if a user A blocks another user B, if user B refreshes the browser or leaves and re-enters the room, user B will still be blocked.
As a side effect, this allows us to completely remove the "sockets" property in the SocketManager on the Pusher.
 2021-07-07 11:24:51 +02:00
David Négrier
46e6917df6 Adding a playersStore 
The playerStore can be useful to get the details of a given player from its ID.
 2021-07-06 17:13:08 +02:00
_Bastler
74823177f5 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-02 20:59:39 +02:00
jonny
7f61e9addd Merge remote-tracking branch 'remotes/upstream/develop' into tiles-start-positions 2021-06-25 18:14:40 +02:00
_Bastler
f4d2897957 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-06-24 13:02:41 +02:00
David Négrier
2f282e3469 peerStore loading order caused issues. Fixed in GameScene (+ extracted a few stores in their files) 2021-06-24 11:54:09 +02:00
David Négrier
e4708149e0 Merge branch 'develop' of github.com:thecodingmachine/workadventure into svelte_video_overlay 
# Conflicts:
#	front/package.json
#	front/src/Components/App.svelte
#	front/src/Phaser/Game/GameScene.ts
#	front/src/Phaser/Menu/MenuScene.ts
#	front/src/WebRtc/MediaManager.ts
 2021-06-24 10:49:55 +02:00
David Négrier
8d59680de5 Removing useless code 2021-06-24 10:36:47 +02:00
David Négrier
5ed61012f0 Created a PeerStatus type instead of "connecting" | "connected" | "error" | "closed" 2021-06-24 10:34:36 +02:00
_Bastler
ab20a074fe Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-06-24 09:47:16 +02:00
GRL
95d8cf9257 Change requested 2021-06-23 14:54:06 +02:00
GRL
ca3f5c599a Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi 2021-06-22 14:00:19 +02:00
David Négrier
cddade059f Removing commented code 2021-06-21 14:49:41 +02:00
David Négrier
227575043b Removing dead code 2021-06-17 18:56:30 +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
3b278d0498 Removing dead code 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
59ab1cdbae remove focus (unneccesary) 2021-06-16 12:06:23 +02:00
_Bastler
b3c58bd5d4 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-06-15 15:24:00 +02:00
kharhamel
a5779095f8 FIX: cowebsite resize now works on touchscreens 2021-06-15 10:55:18 +02:00
_Bastler
7a10f4ecb6 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-06-08 16:46:32 +02:00
David Négrier
ac911cff4b Properly escaping name in discussion manager 2021-06-07 10:42:08 +02:00
_Bastler
d20ca2f15b Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-06-04 21:08:43 +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
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
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
_Bastler
f24a547814 merge dev 2021-06-04 08:53:45 +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
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
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
David Négrier
9d6b597552 Starting working towards migrating the help camera popup 2021-06-01 09:08:02 +02:00
David Négrier
11fb0aa1d8 Fixing typo 2021-05-31 17:53:27 +02:00
David Négrier
13d3227323 Migrating LoginScene to Svelte 2021-05-31 17:03:29 +02:00
GRL
b8873d1277 selectCompanionScene work with svelte 2021-05-31 12:06:11 +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
b7f1461405 Removing listeners from MediaManager. 
SimplePeer now reacts only to stores.
 2021-05-29 22:04:08 +02:00
David Négrier
b3aa8975e9 Switching the video feedback in Svelte 2021-05-28 16:20:02 +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
_Bastler
7bdbc191b5 merge latest dev 2021-05-26 19:14:18 +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
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
GRL
201fcf6afa Merge branch 'gamestate-api-read' of github.com:jonnytest1/workadventure into metadataScriptingApi 2021-05-18 15:18:35 +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
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
3e66a541e3 add website focus overlay 2021-05-16 18:48:48 +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
David Négrier
fe573893a1
Merge pull request #1039 from thecodingmachine/importsNotUsedAsValues 
Setting "importsNotUsedAsValues": "error"
 2021-05-13 19:43:34 +02:00
_Bastler
e329c39741 fix perfomance 2021-05-13 15:56:51 +02:00
_Bastler
6e9b2e8d31 merge develop, add animated tiles 2021-05-13 15:09:02 +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