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

295 commits

Author SHA1 Message Date
David Négrier 267d0a2cd1 Moving audio message to Svelte 2021-06-02 16:46:28 +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 1ed881e0bf arrow up black and white colors 2021-05-31 18:05:34 +02:00
GRL 047337ae81 Merge branch 'resizeSelect' of github.com:thecodingmachine/workadventure into resizeSelect 2021-05-31 17:53:44 +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 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 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
David Négrier b3aa8975e9 Switching the video feedback in Svelte 2021-05-28 16:20:02 +02: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
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
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
kharhamel 595c5ca64d now use custom emotes with tweens instead of transistions 2021-05-25 16:37:24 +02:00
kharhamel a1d52b4265 FEATURE: added the possibility toplay emotes 2021-05-19 15:17:03 +02:00
David Négrier 7cc1e5b2c6 Moving styles out of the "dist/" directory 2021-05-17 16:41:40 +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 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
Gregoire Parant e50aad0ea0 Add WA logo 2021-05-11 10:13:50 +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 7d2cc66f11 Fixing pointer-events interaction preventing virtual joystick from working 2021-05-05 11:56:24 +02:00
grégoire parant 71eb3f3b69
Improvement feature circle discussion (#977) 
* Improvment circle discussion
 - Change to lissen start event of WebRTC connection

* Update help allow navigator and waring message
 - Show warning message.
 - Use help camera allow setting to show modal and help user.
 - Change feature to show the modal only when user have need the information on allow navigator access

* Create soud for video discussion
 2021-05-05 01:49:04 +02:00
grégoire parant 19ae575b4f
HotFix style help modal (#960) 2021-04-29 01:49:09 +02:00
grégoire parant 5c0b5ef74b
HotFix release v1.3.1 (#958) 
- Update camera style support mobile
 - Fix admin console error
 2021-04-29 01:26:09 +02:00
grégoire parant 9b69910cb8
WIP: Update style for mobile (#942) 
* Update style for mobile

 - Update style for mobile modale

* Fix overscroll

* Change css properties overflow

* Revert "Change css properties overflow"

This reverts commit 612fcc7e007fb03c7f72e5fa4b8a0604a184ae7d.

* rm image

* Update view mobile

* Fix CI
 2021-04-27 23:58:33 +02:00
grégoire parant f0d277af32
Nickname not centered in video-container (#935) 
* Nickname not centered in video-container

#823
 2021-04-24 15:45:58 +02:00
Gregoire Parant 364c1d3e98 Merge branch 'master' into develop 2021-04-24 10:39:49 +02:00
Gregoire Parant 0c72378001 Fix style message displaying 
#926
 2021-04-24 10:36:53 +02:00
Gregoire Parant b934d3404f Fix feedback WorkAdventure team 2021-04-23 19:29:43 +02:00
Gregoire Parant f11e936143 Refactoring & fix feedback WorkAdventure 2021-04-23 03:59:14 +02:00
Gregoire Parant d7f00b505a Update Companion Scene for mobile 2021-04-22 13:10:23 +02:00
Gregoire Parant 3697ddabfa Fix responsive Camera Settings 2021-04-22 11:47:59 +02:00
Gregoire Parant 3df32de83b Update camera and adapte for mobile 2021-04-22 11:26:35 +02:00
Gregoire Parant 0a04f5d631 Finish select character scene and custom character scene 2021-04-22 02:29:13 +02:00
David Négrier 84bd5eff50 Bump Phaser version 
This reverts commit f2c3d6f158.
Also, updates all dependencies to their latest allowed version.

# Conflicts:
#	front/package.json
#	front/yarn.lock
 2021-04-21 10:35:38 +02:00
Gregoire Parant 78d888ffaf Update menu mobile 
- Add mobile style share modal
- Add mobile style settings modal
- Add menu mobile style
 2021-04-21 00:53:45 +02:00
Gregoire Parant 20e0a2553e Update cowebsite mobile style 2021-04-20 21:11:05 +02:00
Gregoire Parant 30c1825abd Update syle mobile 
- update my video side
- update user video side
- update button video cam and microphone side
 2021-04-20 19:54:37 +02:00
Gregoire Parant 09d5e0b689 Fix center select name modal 2021-04-20 18:58:19 +02:00
Gregoire Parant 2c862fe7e7 Refactor Login Scene 2021-04-20 18:49:42 +02:00
Kharhamel 5dc2f0ac47
Merge pull request #898 from thecodingmachine/touchZoom 
FEATURE: add the ability to zoom in and out using touch screen
 2021-04-20 14:51:08 +02:00
kharhamel 341b048d6c improved the visuals of the joystick 2021-04-20 14:26:52 +02:00
Gregoire Parant 5e8951fdaa Merge branch 'master' into develop 2021-04-19 21:19:35 +02:00
Gregoire Parant e7b5bb261d HotFix performance 
- Change forceSetTimeOut to false and permit to freeze the scene.
 - Fix style sending audio message
 - Fix banned message from admin console
 2021-04-19 20:19:40 +02:00
David Négrier 06f6b3153c
Merge pull request #913 from ClementVieilly75/FTUEPopup 
Ftue popup
 2021-04-19 16:24:02 +02:00
DESKTOP-FMM8UI0\CLV b9d9a78868 Link changed in Tutov3 
Change position of cam and buttons share/cam/Mic
 2021-04-19 14:42:49 +02:00
DESKTOP-FMM8UI0\CLV d31021c02d Replace share screen logo 2021-04-19 14:19:16 +02:00
Gregoire Parant a42e873f64 Merge branch 'master' into develop 2021-04-14 20:11:41 +02:00
Gregoire Parant 4119f69879 HotFix 
- Key up m when user write message
 - Size game share
 2021-04-13 12:30:15 +02:00
kharhamel f82551016a FIX: in vertical mode, the coWebSite now open from the top 2021-04-13 11:34:14 +02:00
PizZaKatZe 633bdfcaff Always enable virtual joystick 
Keeps 'toggle fullscreen' as a separate game setting.
 2021-04-13 02:00:06 +02:00
PizZaKatZe c3230bc2b3 Integrate virtual joystick 2021-04-13 02:00:03 +02:00
Gregoire Parant 4fc9a12b95 HotFix style WorkAdventure 2021-04-12 18:17:04 +02:00
Johannes Berthel 6ee4889773 added change companion button to menu 2021-04-02 23:13:03 +02:00
kharhamel a30923ceae FEATURE: improved the fullscreen and close buttons to be in the aside element 2021-03-31 18:39:51 +02:00
David Négrier aaaa192b71 Merge branch 'develop' of github.com:thecodingmachine/workadventure into iframe_api 
# Conflicts:
#	front/dist/.gitignore
#	front/dist/index.tmpl.html
#	front/src/Phaser/Game/GameScene.ts
#	front/src/WebRtc/CoWebsiteManager.ts
 2021-03-28 16:53:15 +02:00
Valdo Romao f7c4592944 Updated favicons 2021-03-24 23:10:02 +00:00
Kharhamel ec2fa9501c
Merge pull request #813 from thecodingmachine/warningMessage 
Warning message
 2021-03-24 14:27:13 +01:00
kharhamel 8d6c1a50bf FEATURE: warning message when world is near full capacity 2021-03-23 17:44:47 +01:00
PizZaKatZe 821f91e996 Finer steps for audio volume 2021-03-22 20:10:27 +01:00
PizZaKatZe 132c6c9ad6 Fix volume auto-reduction in conversations 2021-03-22 20:09:09 +01:00
PizZaKatZe 20d3236e73 Fix audio control box appearance 2021-03-22 20:06:55 +01:00
DESKTOP-FMM8UI0\CLV 3ef3561b57 no message 2021-03-22 16:10:21 +01:00
PizZaKatZe c0bf5755ed front: Fix page template 2021-03-21 11:28:02 +01:00
PizZaKatZe 97ec721c2a front: Fix page template indentation 2021-03-21 11:28:02 +01:00
GRL e50c8bc354 Suppression of *{...} in every HTML files because the style.ccs file already declare it. 
Suppression unused code
 2021-03-19 16:21:35 +01:00
GRL 0eb16bce6f Suppression width in Html file 2021-03-19 15:58:02 +01:00
GRL 1cfb22f695 Creation of the HelpCameraSettingsScene 
Update of GameManager and index to include the new scene
Change title of helpCameraSettings
Suppression function reset
 2021-03-19 15:40:07 +01:00
GRL c654f722e3 Add Firefox image 
Check permissions in the game
Button Continue to continue without allowing camera and microphone
 2021-03-19 12:04:37 +01:00
Gregoire Parant d68406d5e1 Create input need page 2021-03-19 12:02:42 +01:00
kharhamel 32fdfaab35 edited CoWebsiteManager to manage vertical resizing 2021-03-18 16:11:22 +01:00
kharhamel 0701e607fa added sass loader to the project and put the cowebsite style in its own sass file 2021-03-18 12:37:05 +01:00
kharhamel f9c8b4131c added fullscreen 2021-03-17 18:57:00 +01:00
kharhamel 272be3eba0 improve the visual of the cowebsite 2021-03-17 18:35:19 +01:00
kharhamel 3f6c61633a FEATURE: complete control over the iframe size 2021-03-17 18:34:12 +01:00
Kharhamel 19856c0ee9
Merge pull request #783 from Moini/patch-1 
Improve visibility of close button for embedded web pages
 2021-03-17 14:35:11 +01:00
David Négrier ed2ce68f37 Merge branch 'FTUEPopup' of github.com:ClementVieilly75/workadventure into iframe_api 
# Conflicts:
#	front/dist/.gitignore
#	front/src/Phaser/Game/GameScene.ts
 2021-03-09 15:35:51 +01:00
DESKTOP-FMM8UI0\CLV bbf5003e16 move font press start 2P from index.html to style.css 2021-03-09 14:21:11 +01:00
DESKTOP-FMM8UI0\CLV b175b7164d Merge branch 'develop' of https://github.com/thecodingmachine/workadventure into FTUEPopup 
* 'develop' of https://github.com/thecodingmachine/workadventure:
  Trying to enable back connection on admin from develop, knowing that the develop certificate is broken. Fixing priority.
  Trying to enable back connection on admin from develop, knowing that the develop certificate is broken
  Revert "Adding back admin in develop branch CI"
  Adding back admin in develop branch CI
  Fixing GA tag not included in play domain
  FEATURE: better implementation of the admin global message
  Fix ci
  Update private access
  Allow URLs relative to map base in iframe / openWebsite

# Conflicts:
#	front/src/Phaser/Game/GameScene.ts
 2021-03-09 13:57:05 +01:00
DESKTOP-FMM8UI0\CLV 858bf0b384 Adding property tile "inGameConsoleMessage", open a popup when user walk on a tile with this property 
Adding map "Tuto2", the FTUE map
 2021-03-08 09:28:15 +01:00
David Négrier 6fbf165c91 Adding the ability to register a single script using the "script" attribute at the map property level. 2021-03-07 21:02:38 +01:00
David Négrier 15405633d1 Fixing GA tag not included in play domain 
The GA tag was not properly included because the index.html file that contained it was overwritten by Webpack's HtmlWebpackPlugin.
 2021-03-05 10:00:11 +01:00
David Négrier eb93a04341 Adding an API for inter-iframe communication 
Adds a first version of an API to communicate between an iFrame opened by WorkAdventure and WorkAdventure itself.
The first API method is a method allowing to add messages in the chat, from the iFrame.

Comes with a test file.
 2021-03-04 19:00:00 +01:00
Moini 95da470a89
Improve visibility of close button for embedded web pages 
The button (a white x) wasn't visible on white background. Now it is. Also is a little bit larger and changes color on hover.
 2021-03-01 14:08:56 +01:00
David Négrier 6e9c715980
Merge pull request #739 from t10r/fix/multi-user-videochat-mode 
fix multi user videochat mode
 2021-02-19 14:54:38 +01:00
David Négrier e07efbdf28
Merge pull request #698 from thecodingmachine/fix/deploy-cleanup 
Adding docker-compose.prod.yaml to ease deployment
 2021-02-16 10:35:18 +01:00
Tim Schlüter 05b829da70 fix multi user videochat mode 2021-02-13 21:19:45 +01:00
kharhamel 0c892e0243 FEATURE: implemented a client side blacklist 2021-02-12 19:15:24 +01:00
David Négrier adb535d1b6
Merge pull request #703 from thecodingmachine/socialNetworkLink 
Social network link anonymous connexion
 2021-02-04 16:10:25 +01:00
Gregoire Parant 59b4b168e9 Social network link anonymous connexion 
In menu, add social newtork link when user is connected in anonymous mode
 2021-02-03 23:14:31 +01:00
Gregoire Parant 4de9b8ba40 Fix icon discussion 
- Fix size of discussion icon
- Update x and y when page is resize
- Fix blanc link in chat
 2021-02-03 23:11:33 +01:00
grégoire parant f2b9f6c92a
Merge pull request #686 from thecodingmachine/publicReportedUser 
Permit puiblic report
 2021-02-02 18:09:25 +01:00