David Négrier
870f16f9c6
Merge branch 'develop' of github.com:thecodingmachine/workadventure into SoundInMapScript
2021-05-26 16:15:33 +02:00
David Négrier
fac6574cb5
Removing console.log and unused files
2021-05-26 16:08:43 +02:00
David Négrier
1bf4475e1b
Merge pull request #1023 from thecodingmachine/dependabot/npm_and_yarn/maps/hosted-git-info-2.8.9
...
Bump hosted-git-info from 2.8.8 to 2.8.9 in /maps
2021-05-26 15:49:17 +02:00
David Négrier
4d18e0ceb4
Removing parsing of TSX files in "maps" container
...
The TSX extension is used by Typescript (for JSX like files) but ALSO by Tiled (for tilesets).
We don't need the Typescript TSX files so this PR is preventing Typescript from parsing those files in the "maps" container.
2021-05-25 10:43:01 +02:00
DESKTOP-FMM8UI0\CLV
0c3b9ccfbf
Merge branch 'develop' of https://github.com/thecodingmachine/workadventure into SoundInMapScript
...
# Conflicts:
# front/src/Api/IframeListener.ts
# front/src/Phaser/Game/GameScene.ts
# front/src/iframe_api.ts
# maps/Tuto/scriptTuto.js
# maps/Village/Village.json
2021-05-21 17:45:26 +02:00
dependabot[bot]
25d1e575ef
Bump hosted-git-info from 2.8.8 to 2.8.9 in /maps
...
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info ) from 2.8.8 to 2.8.9.
- [Release notes](https://github.com/npm/hosted-git-info/releases )
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md )
- [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9 )
Signed-off-by: dependabot[bot] <support@github.com>
2021-05-10 16:57:45 +00:00
David Négrier
954b87db41
Merge pull request #1002 from thecodingmachine/dependabot/npm_and_yarn/maps/lodash-4.17.21
...
Bump lodash from 4.17.20 to 4.17.21 in /maps
2021-05-10 18:57:16 +02:00
David Négrier
c025d1798b
Renaming restorePlayerControls/disablePlayerControls
...
Putting "controls" in the plural form:
- restorePlayerControl => restorePlayerControls
- disablePlayerControl => disablePlayerControls
2021-05-10 12:18:06 +02:00
dependabot[bot]
9c620de649
Bump lodash from 4.17.20 to 4.17.21 in /maps
...
Bumps [lodash](https://github.com/lodash/lodash ) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases )
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21 )
Signed-off-by: dependabot[bot] <support@github.com>
2021-05-07 13:45:25 +00:00
David Négrier
66490c9083
Adding test map to test energy consumption
2021-05-06 16:31:39 +02:00
Gregoire Parant
1440faf825
Merge branch 'master' into develop
2021-05-06 00:57:55 +02:00
grégoire parant
46978d26f9
Add entry map village WorkAdventure ( #997 )
2021-05-06 00:53:04 +02:00
David Négrier
f085393730
Merge pull request #992 from tabascoeye/patch-2
...
getting rid of special char in filename
2021-05-05 18:34:46 +02:00
David Négrier
c1be97e366
Adding test cases for mobile
2021-05-05 16:18:37 +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
TabascoEye
8d45338044
re-upload without accent in filename
2021-05-04 13:50:07 +02:00
TabascoEye
2b30bea3e0
Delete sol_intérieur.png
2021-05-04 13:49:32 +02:00
TabascoEye
ec02b11b7f
remove accent from filename
2021-05-04 13:48:20 +02:00
grégoire parant
622e0c6130
Add WA logo in village map ( #989 )
2021-05-04 12:39:00 +02:00
grégoire parant
95ec5dc3f6
Merge pull request #917 from ClementVieilly75/MapWA_Feature
...
Map village with new WA Office and features presented
2021-05-03 20:12:33 +02:00
kharhamel
fe27169745
solved conflict with develop
2021-04-29 10:31:16 +02:00
Gregoire Parant
16397fe978
Merge branch 'master' into develop
2021-04-27 23:59:25 +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
GRL78
57194fd0a1
Add maps for test ( #915 )
2021-04-27 23:45:28 +02:00
David Négrier
22cb41dc29
Adding the ability to display "Text" objects from Tiled
...
I honestly don't believe text objects look good on map, and in real maps, I think text should be written on tiles.
However, for a variety of use cases (like in test maps in the /maps/test directory, it can be useful to be
able to display some text easily on a map.
This PR adds the ability to display this text.
Note: the "font" support cannot work correctly, as Tiled is listing fonts from the local
system, and those fonts are not available in a browser.
2021-04-26 11:28:13 +02:00
David Négrier
6815fe7a0a
Added a new LayersIterator class
...
This class iterates recursively over layers, flattening groups.
This enables us to simplify the code when we iterate layers. We can remove all recursive function calls in the GameScene code (it is delegated to the LayersIterator)
2021-04-26 11:21:34 +02:00
DESKTOP-FMM8UI0\CLV
b79d76fc2e
parameter soundConfig is now optionnal
...
if user call mySound.play() the sound will be played with the base SoundConfig
2021-04-23 17:03:17 +02:00
DESKTOP-FMM8UI0\CLV
f8bab9ce6b
Map Village with all the tilesSets
2021-04-23 15:39:45 +02:00
DESKTOP-FMM8UI0\CLV
f03f8076f3
Sound in Script Done
...
Fom script user can load, play and stop sound
2021-04-23 15:35:34 +02:00
DESKTOP-FMM8UI0\CLV
517c0e86cb
Can play Sound from a map script
...
add sound in the TutoMap
2021-04-21 16:47:19 +02:00
DESKTOP-FMM8UI0\CLV
676dbcc9d0
Map village with new WA Office and features presented
2021-04-20 16:56:48 +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
David Négrier
94317be1ae
Improving test cases
...
This PR improves test cases by adding a "index.html" webpage listing test maps
and by adding text in the map, explaining what needs to be tested.
2021-04-17 21:31:09 +02:00
David Négrier
16daf7332a
Adding the ability to display "Text" objects from Tiled
...
I honestly don't believe text objects look good on map, and in real maps, I think text should be written on tiles.
However, for a variety of use cases (like in test maps in the /maps/test directory, it can be useful to be
able to display some text easily on a map.
This PR adds the ability to display this text.
Note: the "font" support cannot work correctly, as Tiled is listing fonts from the local
system, and those fonts are not available in a browser.
2021-04-17 12:05:54 +02:00
David Négrier
d80681c40b
Merge branch 'develop' into FTUEPopup
2021-04-09 17:40:26 +02:00
DESKTOP-FMM8UI0\CLV
8720354c87
exit Url changed : tcm/workadventure/floor0
2021-04-09 16:39:37 +02:00
DESKTOP-FMM8UI0\CLV
2c84d9a07d
position of popups changed
...
clear log in gameScene
2021-04-09 16:34:01 +02:00
DESKTOP-FMM8UI0\CLV
d52c983ab9
Merge branch 'FTUEPopup' of https://github.com/ClementVieilly75/workadventure into FTUEPopup
2021-04-09 14:35:20 +02:00
DESKTOP-FMM8UI0\CLV
46cc7b3b3b
add pannels
2021-04-09 14:35:15 +02:00
David Négrier
fb6a529e4a
Merge pull request #879 from ClementVieilly75/FTUEPopup
...
map village + popUp go to page
2021-04-08 12:02:50 +02:00
David Négrier
34e89fa63e
Update maps/Village/scriptMapVillage.js
2021-04-08 12:02:14 +02:00
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
3ef1f0dc7b
[Breaking change] UPLOADER_URL and ADMIN_URL are now true URLs (and not only host name) and API_URL is replaced by PUSHER_URL
...
API_URL is still accepted for BC compatibility of the self-hosted deployments.
This will allow deploying on a single domain, using a reverse proxy that acts on the path.
This however means that the config needs to be changed for all WorkAdventure deployments.
2021-03-31 16:00:14 +02:00
David Négrier
ccb80317ee
Changing exit URL of Tuto map
2021-03-28 17:33:10 +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
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