jonnytest1
cb19721dca
Merge branch 'develop' into load-page-api
2021-05-07 20:02:08 +02: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
jonny
99bd9d88d9
renamed api method "exitSceneTo"
2021-04-29 10:56:56 +02:00
jonny
99926a89b2
added goToPage.json with the loadPAge Api call to the index.html
2021-04-29 10:55:01 +02:00
jonny
8f1aea1c43
Merge remote-tracking branch 'remotes/workadventure-main/develop' into load-page-api
2021-04-29 10:49:14 +02:00
jonny
8f6c65384a
added example script for map exit
2021-04-29 10:43:51 +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
f8bab9ce6b
Map Village with all the tilesSets
2021-04-23 15:39:45 +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
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
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