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

3175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
afac042706 supp debug log 2021-03-09 13:53:46 +01:00
David Négrier
f3c67a94ee Trying to enable back connection on admin from develop, knowing that the develop certificate is broken. Fixing priority. 2021-03-09 09:12:55 +01:00
David Négrier
2bef328d8a Adding the abaility to track users entering/leaving a zone in the script language. 2021-03-08 18:58:38 +01:00
David Négrier
1a4c7ad928 Trying to enable back connection on admin from develop, knowing that the develop certificate is broken 2021-03-08 10:58:57 +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
7d67f55012 Improving security: only iframes opened with "openWebsiteAllowApi" property are now able to send/receive messages. 2021-03-06 16:00:07 +01:00
David Négrier
e927e0fa16 Adding ability to listen to user types chat messages using WA.onChatMessage 2021-03-06 15:26:07 +01:00
David Négrier
80df1ffb5f Revert "Adding back admin in develop branch CI" 
This reverts commit c384a73edf.
 2021-03-05 17:45:16 +01:00
David Négrier
c384a73edf Adding back admin in develop branch CI 2021-03-05 16:52:54 +01:00
David Négrier
5178dff108 Adding strong checks on messages exchanged using generic-type-guard 2021-03-05 16:50:54 +01:00
David Négrier
83fa23a82d Fixing eslint 2021-03-05 11:47:04 +01:00
David Négrier
99ab99d893
Merge pull request #792 from thecodingmachine/gafix 
Fixing GA tag not included in play domain
 2021-03-05 10:52:16 +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
David Négrier
bf8e8bf777
Merge pull request #689 from znerol-forks/feature/cowebsite-load-map-relative-url 
Allow URLs relative to map base in iframe / openWebsite
 2021-03-04 18:21:48 +01:00
Kharhamel
5833629469
Merge pull request #784 from thecodingmachine/betterGlobalMessage 
FEATURE: better implementation of the admin global message
 2021-03-04 18:10:52 +01:00
kharhamel
ad7e16c33b FEATURE: better implementation of the admin global message 2021-03-04 16:18:06 +01:00
grégoire parant
df610aa01b
Merge pull request #785 from thecodingmachine/updatePrivateAccess 
Update private access
 2021-03-02 14:35:39 +01:00
Gregoire Parant
915d945dd5 Fix ci 2021-03-01 22:32:50 +01:00
Gregoire Parant
30f4793342 Update private access 2021-03-01 22:21:52 +01:00
David Négrier
e0540790e1 Translating button 2021-03-01 14:36:18 +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
48c13119bd
Merge pull request #776 from s00500/fix_report_menu 
Fix report userId in report menu
 2021-02-27 23:16:23 +01:00
Lukas Bachschwell
2772d72eba
Fix report userId in report menu 
Signed-off-by: Lukas Bachschwell <lukas@lbsfilm.at>
 2021-02-24 21:32:16 +01:00
githubIsNotOpenSourceLOL
6e6b607226
Use email address from .env 2021-02-19 23:10:48 +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
3eec41a1d0
Merge pull request #762 from thecodingmachine/develop 
Deploy 2021-02-18
 2021-02-18 20:10:55 +01:00
David Négrier
6f06b92395
Merge pull request #760 from thecodingmachine/turncredentials 
Fixing screensharing Coturn credentials
 2021-02-18 14:09:33 +01:00
David Négrier
13a20a0ef0 Fixing screensharing Coturn credentials 
When screensharing is initiated by the user, we previously did not send the correct Coturn credentials.
We now send the last credentials received from the Video stream.
 2021-02-18 11:52:30 +01:00
grégoire parant
b5514e6e48
Merge pull request #759 from thecodingmachine/jitsiConfig 
Fix last properties changed after trigger change position
 2021-02-18 11:37:41 +01:00
Gregoire Parant
772c3174be Fix last properties changed after trigger change position 2021-02-18 11:32:37 +01:00
grégoire parant
3a1b2490ef
Merge pull request #758 from thecodingmachine/jitsiConfig 
Jitsi config
 2021-02-18 10:12:16 +01:00
Gregoire Parant
80449e9a96 Change json map test 2021-02-18 10:00:13 +01:00
Gregoire Parant
8a2954eab9 Fix new conf feature 2021-02-18 09:38:27 +01:00
grégoire parant
13078489c6
Merge pull request #757 from thecodingmachine/jitsiConfig 
Merge Jitsi config
 2021-02-17 20:34:31 +01:00
Gregoire Parant
5ddf909fe6 Remove unless export constante 2021-02-17 20:26:33 +01:00
grégoire parant
c3286e61cf
Merge pull request #655 from thecodingmachine/exitTriggerAction 
Message trigger action
 2021-02-17 19:47:46 +01:00
Gregoire Parant
fff0cbc3f6 Revert message exit 2021-02-17 19:40:00 +01:00
Gregoire Parant
9b7b3eb140 Update feedback @tabascoeye 2021-02-17 19:31:05 +01:00
Gregoire Parant
ce423c9fec Remove exit trigger action 2021-02-17 19:29:59 +01:00
Gregoire Parant
83fc7d0cc0 Merge branch 'develop' into exitTriggerAction 
# Conflicts:
#	front/src/Phaser/Game/GameScene.ts
 2021-02-17 19:28:41 +01:00
Gregoire Parant
baae1e8125 Update to restore previous config 2021-02-17 19:21:37 +01:00
Gregoire Parant
e8b1b286a3 Merge Jitsi config 2021-02-17 18:49:55 +01:00
David Négrier
36a713ec91
Merge pull request #754 from thecodingmachine/develop 
Deploy 2021-02-16
 2021-02-16 20:28:39 +01:00
David Négrier
ae1d00c828
Merge pull request #736 from MisterErwin/patch-1 
Fix offsets of SpeechBubble.ts
 2021-02-16 20:02:03 +01:00
David Négrier
43b48ce555
Merge pull request #737 from MisterErwin/patch-2 
Do not change rooms if scene failed to load
 2021-02-16 20:01:00 +01:00