Commit graph

1508 commits

Author SHA1 Message Date
DESKTOP-FMM8UI0\CLV 0f4034854c Add closePopup function 2021-04-08 10:50:41 +02:00
DESKTOP-FMM8UI0\CLV eb66ab3fdd Supp arrow white 2021-04-08 10:17:52 +02:00
DESKTOP-FMM8UI0\CLV af69510bc8 Modif popup positions and add arrow 2021-04-08 09:41:53 +02:00
DESKTOP-FMM8UI0\CLV 39074511a4 map village + popUp go to page 2021-04-07 13:06:30 +02:00
David Négrier 98aa94bb12 Minor changes 2021-03-28 16:36:02 +02:00
DESKTOP-FMM8UI0\CLV 8764fe5de5 Popup openWebSite
Add possibility to open a website with a popup
3 cases :
Open page
GoTo Page
OpenCoWebsite
2021-03-25 17:12:53 +01:00
DESKTOP-FMM8UI0\CLV 7140637807 Map tuto version 3 by Jack O 2021-03-25 09:06:41 +01:00
DESKTOP-FMM8UI0\CLV cb1459de96 remove exitUrl 2021-03-24 11:00:24 +01:00
DESKTOP-FMM8UI0\CLV 7c7916df60 remove useless files and clean code in ScriptTuto.js 2021-03-24 10:58:30 +01:00
DESKTOP-FMM8UI0\CLV e05c25a857 replace let for const for variables non reassigned 2021-03-23 17:15:22 +01:00
DESKTOP-FMM8UI0\CLV 77e768e5f7 Add map Tuto v2 and scriptTuto.js 2021-03-23 16:00:24 +01:00
DESKTOP-FMM8UI0\CLV f437b6057c subProject maps/Tuto 2021-03-23 15:58:32 +01:00
DESKTOP-FMM8UI0\CLV 3ef3561b57 no message 2021-03-22 16:10:21 +01:00
DESKTOP-FMM8UI0\CLV 0ffbf8b4b7 Add Final popup to notify that the tuto is finished, some CSS on the popups and clean code 2021-03-22 16:09:04 +01:00
DESKTOP-FMM8UI0\CLV 662134498c Merge branch 'iframe_api' of https://github.com/thecodingmachine/workadventure into FTUEPopup
# Conflicts:
#	front/src/Phaser/Game/GameScene.ts
2021-03-12 17:06:42 +01:00
David Négrier 086b88b09a Merge branch 'develop' of github.com:thecodingmachine/workadventure into iframe_api 2021-03-12 18:02:02 +01:00
DESKTOP-FMM8UI0\CLV c5c8770a60 Add First Version of Tuto
PopUp
Player Control disable
Fake bubble displayed
2021-03-12 16:39:29 +01:00
Kharhamel 18fa1e6153
Merge pull request #807 from thecodingmachine/improvePlayerAnims
FIX: player anims correctly stop on the idle frame
2021-03-11 16:34:20 +01:00
kharhamel fe8c75610d FIX: player anims correctly stop on the idle frame 2021-03-11 16:21:02 +01:00
DESKTOP-FMM8UI0\CLV fa4d917729 Resolve conflit with GameScene.ts 2021-03-11 16:03:39 +01:00
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
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