_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,465 Commits 2 Branches 0 Tags 47 MiB
0d4befc850
Commit Graph

265 Commits

Author SHA1 Message Date
grégoire parant
a0d863569b
WIP: Bypass camera scene (#1337) 
* Set new local camera setup variable

* Finish by pass video settings

 - TODO add button to update camera settings

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

* Merge branch 'develop' into jumpVideoCamera

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

# Conflicts:
#	front/src/Connexion/LocalUserStore.ts
#	front/src/Phaser/Components/Loader.ts
#	front/src/Phaser/Game/GameManager.ts
#	front/src/Phaser/Login/EnableCameraScene.ts

* Add menu to open enable camera scene

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

* Finish jump camera setup

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-09-04 21:31:36 +02:00
kharhamel
ba5fa06306 FIX: fixed a circular dependancy in stores by rewriting createPeerStore() and createScreenSharingPeerStore() 2021-09-03 17:16:31 +02:00
Lurkars
49b1a55042 Merge branch 'develop' of github.com:thecodingmachine/workadventure into audioPlayerImprovements 2021-09-01 19:25:37 +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
GRL78
19baf7f582
fix ReportMenu (#1397) 2021-09-01 10:11:12 +02:00
GRL
706f531ca2 Add types file in API 2021-08-27 11:17:48 +02:00
GRL
833c15b2d5 Merge branch 'develop' of github.com:thecodingmachine/workadventure into iframeMenuScript 2021-08-27 10:44:32 +02:00
GRL
cf7bfe79ca Refactor to only have one function registerMenuCommand 
When selected custom menu is removed, go to settings menu
Allow iframe in custom menu to use Scripting API
Return menu object when it is registered, can call remove function on it
 2021-08-27 10:34:03 +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
GRL
f3c4d344b3 Add iframe submenu by scripting API 
Delete menu by scripting API
 2021-08-24 17:35:06 +02:00
GRL
2f76a24dff Contact page only if environment variable exist 2021-08-23 17:30:07 +02:00
GRL
2ebf05f7d6 Correction following test 2021-08-19 11:17:46 +02:00
GRL
d6bd883c94 Third pass on css and reportMenu 2021-08-18 15:34:26 +02:00
GRL
5a8e7d277f Second pass on css and reportMenu 2021-08-18 11:30:11 +02:00
GRL
4c3097155b Second pass on css and reportMenu 2021-08-18 11:15:46 +02:00
GRL
9e5cc3b9a7 First pass on css 2021-08-17 15:17:29 +02:00
GRL
096baa8897 First pass on css 2021-08-17 14:44:43 +02:00
GRL
aa9e5c4543 Merge branch 'develop' of github.com:thecodingmachine/workadventure into menuInSvelte 2021-08-16 14:19:28 +02:00
GRL
d2413896c7 GameManager has an attribute scenePlugin 2021-08-16 11:50:09 +02:00
Lurkars
aa38d1a5bd initial localUserStore volume 2021-08-11 20:29:48 +02:00
Lurkars
3702173cd4 migrate to svelte 2021-08-11 20:01:51 +02:00
grégoire parant
f7daf16ac5
New version of cache management (#1365) 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-08-11 17:09:17 +02:00
GRL
f4ce5f9a3b Merge branch 'ReportMenuSvelte' of github.com:thecodingmachine/workadventure into menuInSvelte 2021-08-11 15:04:47 +02:00
GRL
e86892b9a5 Merge branch 'develop' of github.com:thecodingmachine/workadventure into MenuSvelte 2021-08-11 14:13:31 +02:00
GRL
8105e966ff Migration of registerCustomMenu for Menu in Svelte 
Refactor subMenuStore
Suppression of old MenuScene and ReportMenu
 2021-08-11 14:07:34 +02:00
Gregoire Parant
45a56c2e02 HotFix feedback svelte continuous integration 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-08-11 10:09:04 +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
grégoire parant
1db2e2aba9
Update style of microphone (#1352) 
- Active microphone close when user haven't microphone in the discussion
 2021-08-10 10:12:31 +02:00
GRL
9c1926f636 Merge branch 'develop' of github.com:thecodingmachine/workadventure into MenuSvelte 2021-08-09 16:59:12 +02:00
GRL
d10e2dbca7 Migration of report menu in svelte 2021-08-09 16:56:28 +02:00
GRL
56fa2e49f6 New menu svelte 2021-08-09 14:49:17 +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
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
GRL
2cd5b7f0a8 Merge branch 'develop' of github.com:thecodingmachine/workadventure into MenuSvelte 2021-08-05 10:01:23 +02:00
GRL
fe585297fc Merge branch 'develop' of github.com:thecodingmachine/workadventure into MenuSvelte 2021-08-03 17:19:47 +02:00
GRL
2d8098b06d Merge branch 'develop' of github.com:thecodingmachine/workadventure into layoutManagerSvelte 2021-08-03 11:40:51 +02:00
GRL
1436b15328 Migrate layoutManager in Svelte 2021-08-03 11:13:08 +02:00
Gregoire Parant
952e58ecc1 Fix ban message style 2021-08-03 00:34:07 +02:00
Gregoire Parant
14b4229019 Merge branch 'develop' into GlobalMessageToWorld 
# Conflicts:
#	CHANGELOG.md
#	front/src/Api/Events/IframeEvent.ts
#	front/src/Components/App.svelte
#	pusher/src/Services/SocketManager.ts
 2021-08-02 23:07:39 +02:00
Kharhamel
74975ac9d8
Merge pull request #1322 from thecodingmachine/improveCapacityWarning 
FEATURE: improved the room capacity warning visuals
 2021-07-30 14:54:33 +02:00
kharhamel
ebdcf8804d added admin link to the warning container 2021-07-30 14:50:11 +02:00
GRL
bd96a32d5b Merge branch 'develop' of github.com:thecodingmachine/workadventure into GlobalMessageToWorld 2021-07-30 09:38:28 +02:00
kharhamel
41ac51f291 FEATURE: improved the room capacity warning visuals 2021-07-29 18:27:53 +02:00
GRL78
7ffe564e8e
Graphic upgrade of the global message console (#1287) 
* Graphic upgrade of the global message console
Fix: error if LoginScene doesn't exist

* Rework graphic of global message console

* Rework graphic of global message console

* Remove console.log
 2021-07-29 17:42:16 +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
GRL
9e8bed7aab Position of quill tooltip 
Use inlineStyle to indent and align text correctly
 2021-07-23 16:17:53 +02:00
GRL
807abaa2c0 Text global message use delta instead of text 2021-07-23 11:07:17 +02:00
GRL
68ff1b9e17 Merge branch 'develop' of github.com:thecodingmachine/workadventure into GlobalMessageToWorld 2021-07-22 16:26:01 +02:00
GRL
9e16bfc366 playGlobalMessage are receive as adminRoomMessage 
Suppression of GlobalMessageManager and TypeMessage
Migrating message to svelte
 2021-07-22 16:14:27 +02:00
GRL
6e65952d75 SendGlobalMessage by sendAminMessage 2021-07-20 15:16:51 +02:00
GRL78
936f5d0301
Icon chat not italic or bold (#1296) 2021-07-20 10:28:40 +02:00
GRL
0d3c697add Merge branch 'develop' of github.com:thecodingmachine/workadventure into GlobalMessageToWorld 2021-07-19 10:01:13 +02:00
GRL
71bf6b362b Rework graphic of global message console 2021-07-19 09:38:49 +02:00
GRL
214226a271 Rework graphic of global message console 2021-07-19 09:22:47 +02:00
kharhamel
f840034d9c FEATURE: chat tweak 2021-07-16 14:25:59 +02:00
kharhamel
18a65651f3 FIX: media box should always have a height 2021-07-15 16:08:37 +02:00
GRL
e43ea3aa5e Graphic upgrade of the global message console 
Fix: error if LoginScene doesn't exist
 2021-07-15 15:09:35 +02:00
kharhamel
e96cb6930b FIX: visit card is now an absolute position 2021-07-13 17:14:40 +02:00
kharhamel
1ce801cced temp 2021-07-13 14:40:35 +02:00
kharhamel
fecbc8a018 WIP: svelte menu 2021-07-13 14:40:35 +02:00
GRL
01bfbc36b5 Merge branch 'svelteChat' of github.com:thecodingmachine/workadventure into svelteChat 2021-07-13 11:09:32 +02:00
GRL
f7127bfb5a Graphic upgrade 2 2021-07-13 11:05:34 +02:00
GRL
a093298993 Graphic upgrade 2 2021-07-13 11:00:32 +02:00
GRL
e2e94c11ff Autoscroll 2021-07-12 15:00:28 +02:00
GRL
b9a2433283 Upgrade graphic of the chat 2021-07-12 11:59:05 +02:00
kharhamel
3cfbcc6b02 FEATURE: migrated the chat window to svelte 2021-07-07 18:07:58 +02:00
GRL
e1611969ce Merge branch 'develop' of github.com:thecodingmachine/workadventure into jonnytest1-tiles-start-positions 2021-07-02 14:35:28 +02:00
David Négrier
8f3d9277ac Merging master into develop 2021-06-29 18:39:43 +02:00
jonny
7f61e9addd Merge remote-tracking branch 'remotes/upstream/develop' into tiles-start-positions 2021-06-25 18:14:40 +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
GRL
67d4c6e271 Resolve review 2021-06-22 16:12:53 +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
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
GRL
232fd33ec8 Migrating ConsoleGlobalMessageManager in svelte 2021-06-21 17:19:27 +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
4ec92ddf58 Adding new icons for the change layout button 2021-06-17 18:30: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
d888b694cc Adding button to change layout 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
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
David Négrier
0afdbf7040 Fixing Svelte-check errors 2021-06-15 18:34:11 +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
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
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
kharhamel
dd45996f9c FIX: improved the visit card, cleanup the code 2021-06-08 16:39:22 +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
fab5c17dc2 Fixing the cleaning of webcam name 
Closes #1130
 2021-06-08 12:19:07 +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
GRL
aa9c3b9f4f max height on select 2021-06-07 17:18:39 +02:00
GRL
c9da38c7ec reduce select field 2021-06-07 16:23:00 +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
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
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
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
kharhamel
c5f3cfe87c FEATURE: clicking on another player show a contact card when possible 2021-06-03 17:58:21 +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
GRL
4fd453ec05 playsinline on video 2021-06-03 12:02:58 +02:00
GRL
8bcfc3cbee Max height on EnableCameraScene 2021-06-03 10:30:53 +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
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
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
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
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
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
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