noby/workadventure
2
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,995 Commits 1 Branch 0 Tags 26 MiB
5bd5245044
Commit Graph

1995 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DESKTOP-FMM8UI0\CLV
6c21a31004 Update Map Tuto 2021-03-11 15:17:53 +01:00
Gregoire Parant
59c310d0a8 Update to optimize maintainability of the code 2021-03-11 12:17:37 +01:00
DESKTOP-FMM8UI0\CLV
6441fa71d3 Adding placeHolder Popup tuto to Map2 
need to cut player controller and simulate bobble
 2021-03-11 10:58:48 +01:00
Gregoire Parant
2fcb8a76b1 Merge branch 'master' into develop 
# Conflicts:
#	front/src/Connexion/RoomConnection.ts
#	front/src/Phaser/Menu/ReportMenu.ts
 2021-03-11 02:22:05 +01:00
grégoire parant
ce6976ec34
Merge pull request #806 from thecodingmachine/hot-fix-moderate-controls 
Hot fix moderate controls
 2021-03-11 02:13:15 +01:00
Gregoire Parant
2cf99df2da Hot Fix report 2021-03-11 02:03:06 +01:00
Gregoire Parant
46cb9333e6 HotFix message in back 2021-03-11 01:25:36 +01:00
DESKTOP-FMM8UI0\CLV
f9f618094d adding error log if name of square in Tile not matching with the param targetObject of OpenPopup in script.js 2021-03-10 17:22:39 +01:00
dependabot[bot]
d95c71281f
Bump elliptic from 6.5.3 to 6.5.4 in /front 
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.3 to 6.5.4.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.3...v6.5.4)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-10 13:26:46 +00:00
David Négrier
a28fcbb9e6 Catching error when JWT token cannot be generated to avoid crashing Pusher 2021-03-10 09:41:54 +01:00
DESKTOP-FMM8UI0\CLV
8d0411e8a3 can manage position and width/height of a popUp using a square in Tiled 2021-03-10 09:23:45 +01:00
DESKTOP-FMM8UI0\CLV
5e4940dba6 Merge branch 'iframe_api' of https://github.com/thecodingmachine/workadventure into FTUEPopup 
* 'iframe_api' of https://github.com/thecodingmachine/workadventure:
  Removing closeOnClick as it is not implemented
  Adding a Popup object with a close() method on it.
 2021-03-10 09:00:47 +01:00
DESKTOP-FMM8UI0\CLV
f7f8be24bc Set Position of the popUp with pos of an object in floorLayer object group 2021-03-10 08:57:49 +01:00
David Négrier
7fddcc28f1 Removing closeOnClick as it is not implemented 2021-03-09 18:57:25 +01:00
David Négrier
bb8b222c22 Adding a Popup object with a close() method on it. 2021-03-09 18:51:30 +01:00
David Négrier
18464e4942 Adding button clicked handling 2021-03-09 18:05:07 +01:00
Kharhamel
21cc842c33
Merge pull request #793 from thecodingmachine/adminWorldsLimit 
FEATURE: the connexion error an user can get when a world is full is now correctly treated.
 2021-03-09 17:45:43 +01:00
DESKTOP-FMM8UI0\CLV
4545de8af1 Merge branch 'iframe_api' of https://github.com/thecodingmachine/workadventure into FTUEPopup 
* 'iframe_api' of https://github.com/thecodingmachine/workadventure:
  Adding button clicked handling

# Conflicts:
#	front/src/Phaser/Game/GameScene.ts
 2021-03-09 17:12:28 +01:00
DESKTOP-FMM8UI0\CLV
d29e0819f4 Get position of an object in Tile to set popUp Position 2021-03-09 17:07:14 +01:00
kharhamel
8abc34c631 FEATURE: the connexion error an user can get when a world is full is now correctly traited. Also remove a redundant adminApi call 2021-03-09 16:34:19 +01:00
David Négrier
1e002f93ed Implementation of openPopup script method (WIP) 2021-03-09 16:21:14 +01:00
DESKTOP-FMM8UI0\CLV
70898a2f28 Merge branch 'iframe_api' of https://github.com/thecodingmachine/workadventure into FTUEPopup 
* 'iframe_api' of https://github.com/thecodingmachine/workadventure:
  Implementation of openPopup script method (WIP)
  Adding the abaility to track users entering/leaving a zone in the script language.
  Adding the ability to register a single script using the "script" attribute at the map property level.
  Improving security: only iframes opened with "openWebsiteAllowApi" property are now able to send/receive messages.
  Adding ability to listen to user types chat messages using WA.onChatMessage
  Adding strong checks on messages exchanged using generic-type-guard
  Fixing eslint
  Adding an API for inter-iframe communication
 2021-03-09 15:46:22 +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
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