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

337 Commits

Author SHA1 Message Date
_Bastler
16aa859844 merge develop into main 2021-05-17 14:49:18 +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
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
_Bastler
e9baef5963 merge 2021-05-11 20:18:12 +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
_Bastler
deac58ebc7 merge into develop 2021-05-08 20:05: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
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
_Bastler
1783b90d81 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-04-29 08:50:04 +02:00
_Bastler
b60e73d0f1 update nes.css style 2021-04-29 08:48:06 +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
_Bastler
bd40c8fe5e nes.css improvements, fix for camerainfo 2021-04-28 13:10:50 +02:00
_Bastler
92122a3272 nes.css style 2021-04-28 07:07:51 +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
_Bastler
daa7ff5c19 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-04-26 16:08:04 +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
_Bastler
e03cf9dc26 trigger + audioplayer improvements 2021-04-21 07:44:12 +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
_Bastler
d55e6e9c84 Merge branch 'mobile_support' into partey 2021-04-20 21:50:05 +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
_Bastler
6156f9e4d6 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-04-20 11:12:05 +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
_Bastler
df29fa4d96 merge develop 2021-04-13 15:40:02 +02:00
_Bastler
64a3731bfb merge dev, apply partey changes 2021-04-13 15:21:21 +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
David Négrier
8572959cb0
Merge pull request #690 from thecodingmachine/newLogo 
Update Loading page
 2021-02-02 17:26:48 +01:00
David Négrier
274f5eba4c Reworking docker-compose.prod.yaml to make it generic while still having a front container configurable 2021-02-02 11:19:24 +01:00
Manfred Stock
0afbb5412e Improve display of websites not specifying background color 
The `index.html` of the front-end specifies `#000` as background color,
however, it seems like various websites found 'in the wild' don't
specify their own background color and thus default to `transparent`. As
a result of this, they tend to become mostly unreadable when displayed
using `openWebsite` since they often assume that they get displayed on a
white background. Setting white as background color on the container
element of the `<iframe>` works around this issue.
 2021-02-01 22:48:10 +01:00
Gregoire Parant
f99db4856f Add WorkAdventure logo 2021-01-30 20:33:31 +01:00
Gregoire Parant
ac2bc76239 change style report button 2021-01-30 14:08:11 +01:00
Gregoire Parant
7eb38fae83 Permit puiblic report 
- Create report html
 - Add report flag
 2021-01-29 21:09:10 +01:00
Gregoire Parant
0133609770 clean 2021-01-24 16:06:52 +01:00
Jean-Philippe Evrard
e2f400472f Template google analytics data 
Without this patch, the index.html contains google analytics at
all times, including for people self-hosting it.

This is a problem for privacy reasons, and only people wanting
to have analytics on their instances should be able to enable
them.

This fixes it by making sure the index.html page is templated
to sideload content from ANALYTICS_CODE_PATH (which itself is
also templated, for convenience).
 2021-01-19 12:17:05 +01:00
Gregoire Parant
4397ff7712 Update style and focus keyboard 2021-01-06 13:36:18 +01:00
David Négrier
dea7d6dba7
Merge pull request #541 from Informatic/feature/map-sounds 
[rC3] front: implement map sounds
 2021-01-05 13:42:50 +01:00
Gregoire Parant
ac92cbc8f7 Crate share menu and fix menu design 2021-01-04 17:13:41 +01:00
Piotr Dobrowolski
28d687e338 front: implement map sounds 2021-01-04 16:57:31 +01:00
Gregoire Parant
89064d23f9 Fix style 2020-12-18 00:09:07 +01:00
Gregoire Parant
ed214f2b41 Fix style menu 2020-12-17 22:10:36 +01:00
Gregoire Parant
ed8232b0f5 Fix style menu 2020-12-17 21:58:18 +01:00
David Négrier
055131ac66 Typo fixes 2020-12-17 15:20:42 +01:00
Gregoire Parant
2d4193a917 Merge branch 'develop' into notifOutSound 2020-12-17 13:56:21 +01:00
Gregoire Parant
6a21436c9e Update menu 2020-12-16 18:56:02 +01:00
Gregoire Parant
a2d56ef56a Update admin menu 2020-12-16 18:52:11 +01:00
Gregoire Parant
1a27b7d2ee Update menu 2020-12-16 17:17:31 +01:00
Gregoire Parant
af89965db8 Fix style button 2020-12-16 16:32:28 +01:00
Kharhamel
c93d1794b7
Merge pull request #496 from thecodingmachine/fixSkinChangeCrash 
FIX: going back a 2nd time to SelectCharacterScene used to crash the game
 2020-12-16 15:25:36 +01:00
Gregoire Parant
8bf72e1ffd Change out notification sound 2020-12-16 15:10:46 +01:00
kharhamel
eb88db92be FIX: going back a 2nd time to SelectCharacterScene used to crash the game 2020-12-16 15:09:58 +01:00
Kharhamel
1f3c738cd0
Merge pull request #491 from thecodingmachine/updateStyleCss 
update pointer style
 2020-12-16 12:58:37 +01:00
kharhamel
f5e77ad749 FIX: menu flicker 2020-12-16 12:49:34 +01:00
Gregoire Parant
bb8980e1d2 update pointer style 2020-12-15 17:34:47 +01:00
Gregoire Parant
8947e1b781 update pointer style 2020-12-15 17:31:55 +01:00
kharhamel
069f2f1cec FEAT: prototype game menu using html elements, better icon for text chat 2020-12-15 16:37:57 +01:00
kharhamel
a1aedaa594 FEAT: now play a sound when a user quit the webrtc group 2020-12-11 16:01:31 +01:00
Kharhamel
95665a28d5
Merge pull request #456 from thecodingmachine/performance 
Performance settings
 2020-12-03 14:33:12 +01:00
Gregoire Parant
27634a61ee Create menu to set your quality video and game 2020-11-27 16:24:07 +01:00
Kharhamel
17e633ae45
Merge pull request #442 from cbluoss/develop 
Adding more clothing options
 2020-11-26 10:30:54 +01:00
yourcoke
8ff24c38b0
added: engelbert hose + mask 2020-11-24 20:23:20 +01:00
Gregoire Parant
2812387650 Merge branch 'develop' into action-button 2020-11-23 20:08:19 +01:00
yourcoke
bbd3d9efae
added: hoodies 2020-11-21 15:46:04 +01:00
Gregoire Parant
3aaeda6f80 Merge branch 'develop' into action-button 
# Conflicts:
#	front/dist/resources/style/style.css
#	front/src/Phaser/Game/GameScene.ts
 2020-11-21 15:40:24 +01:00
yourcoke
f5e41cc285
added: pride shirt 2020-11-20 15:56:58 +01:00
yourcoke
62f13f6b30
added: mate bottle accessorie 2020-11-20 11:49:08 +01:00
yourcoke
a6c8132f0a
added: tinfoil hat1 2020-11-20 10:59:22 +01:00
Gregoire Parant
1bff2addf1 Merge branch 'develop' into firefox-error-jitsi 
# Conflicts:
#	front/src/WebRtc/MediaManager.ts
 2020-11-17 18:54:51 +01:00
Gregoire Parant
0a7063a478 Add close button 2020-11-17 18:03:44 +01:00
Gregoire Parant
3333b3cee3 Fix feedback moufmouf 2020-11-10 12:38:32 +01:00
Gregoire Parant
74de2746c2 Create action button 2020-10-31 14:04:55 +01:00
Gregoire Parant
a2dd3bd6ab Fix style 2020-10-30 20:35:45 +01:00
Gregoire Parant
724bb7f288 Merge branch 'develop' into feature-discussion 2020-10-30 20:04:12 +01:00
Gregoire Parant
80355e6b85 fix layout mode click when discussion is activated 2020-10-27 20:46:53 +01:00
Gregoire Parant
55c1bcee66 Add callback report in discussion part 2020-10-27 20:18:25 +01:00
Kharhamel
dfd2b2048c
Merge pull request #380 from thecodingmachine/jitsiQOL 
opening and closing jitsi windows now trigger some transitions
 2020-10-27 17:57:56 +01:00
kharhamel
67aa2f4b6c opening and closing jitsi windows now trigger some transitions 2020-10-27 17:44:57 +01:00
Gregoire Parant
850be63284 Fix style 2020-10-26 00:26:10 +01:00
Gregoire Parant
1e096af43b Fix font family 2020-10-26 00:03:30 +01:00
Gregoire Parant
bdb504722f Fix style -webkit-focus 2020-10-25 22:41:31 +01:00
Gregoire Parant
1945c24704 Create send data discussion 2020-10-25 21:59:14 +01:00
Gregoire Parant
f344adc48b Create discussion 
- Add new discussion class
- Feature to discuss and report user
 2020-10-25 19:39:15 +01:00
Gregoire Parant
b6fe9e72e1 Fix style and refactor 2020-10-25 19:38:00 +01:00
Gregoire Parant
e640f67156 update admin navbar 2020-10-24 13:37:33 +02:00
Gregoire Parant
bf9dfcc835 Ban mesage 
- Create type message could be use to send private message at any user
- Create SendMessageUser message
- Add sound when user receive ban message
 2020-10-19 19:32:47 +02:00