_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,825 Commits 2 Branches 0 Tags 47 MiB
bfd418d8b5
Commit Graph

2825 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PizZaKatZe
13fcda7bcf Remove scroll bars 2021-03-21 12:55:14 +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
Kharhamel
519018f6c5
Merge pull request #764 from githubIsNotOpenSourceLOL/patch-1 
Use email address from .env
 2021-03-19 17:30:12 +01:00
David Négrier
4660b450c5
Merge pull request #700 from thecodingmachine/audioCameraPermission 
Input need camera and microphone permission
 2021-03-19 17:09:48 +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
0b00055eda Use includes instead of indexOf 2021-03-19 14:40:18 +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
1f85e548ce
Merge pull request #816 from thecodingmachine/iframeResize 
FEATURE: complete control over the iframe size
 2021-03-18 16:16:54 +01:00
kharhamel
32fdfaab35 edited CoWebsiteManager to manage vertical resizing 2021-03-18 16:11:22 +01:00
githubIsNotOpenSourceLOL
ec691a75fe
Update .env.template 2021-03-18 13:26:02 +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
4a50729db3
Merge pull request #817 from thecodingmachine/customjitsiurl 
Adding the ability to specify a custom Jitsi URL directly in the map
 2021-03-16 21:33:35 +01:00
David Négrier
ffb5823b2a Adding the ability to specify a custom Jitsi URL directly in the map 
This feature allows to add a "jitsiUrl" property in the map.
As a result, you can use for a given Jitsi room a custom instance of Jitsi.
Using "jitsiUrl" will only work with public Jitsi instances (authentication is not supported when "jitsiUrl" property is provided)

The Jitsi external_api.js script is now lazily loaded.
 2021-03-16 20:37:12 +01:00
Wikinaut
d8c74fa838
update /etc/hosts readme 2021-03-15 15:37:51 +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
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
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
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