lbehm/workadventure
1
0
Fork 0
Code Issues Pull requests Releases Activity
2341 commits 21 branches 1 tag 50 MiB
Commit graph

1371 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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