Gregoire Parant
54fab3d233
Merge branch 'master' into develop
2021-08-24 10:45:03 +02:00
GRL
49eb28dacf
Merge branch 'develop' of github.com:thecodingmachine/workadventure into menuInSvelte
2021-08-24 09:38:24 +02:00
_Bastler
2ce9451f2f
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2021-08-23 19:31:49 +02:00
David Négrier
60b6e7baa1
Merge pull request #1375 from thecodingmachine/ListenIFrameWaitCreate
...
Execute scripts of the map after creating gameScene
2021-08-23 19:12:01 +02:00
David Négrier
8c43c2e6e8
Rollback on createPromise switched to public
2021-08-23 18:54:00 +02:00
GRL
ad95fa5e11
Execute scripts of the map after creating gameScene
2021-08-23 18:53:59 +02:00
David Négrier
41c31d3d2f
Merge pull request #1381 from thecodingmachine/samePlaceAfterEditProfile
...
Player return a the same position when after editing his profile
2021-08-23 18:36:43 +02:00
David Négrier
bf6ce94b80
Merge branch 'develop' of github.com:thecodingmachine/workadventure into samePlaceAfterEditProfile
2021-08-23 18:04:09 +02:00
GRL
2f76a24dff
Contact page only if environment variable exist
2021-08-23 17:30:07 +02:00
David Négrier
7fdbcde71c
Merge pull request #1388 from thecodingmachine/BackToLinePopUp
...
Update escapeHtml
2021-08-23 11:25:04 +02:00
Gregoire Parant
99a9b5f9a2
Update strategy to use css
...
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-08-23 10:20:48 +02:00
Gregoire Parant
c4a9da41ba
Merge branch 'master' into BackToLinePopUp
2021-08-23 09:45:32 +02:00
Gregoire Parant
8c4ead8421
Add "\n\r" to match
...
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-08-23 09:43:43 +02:00
Gregoire Parant
da00fa7868
Update escapeHtml
...
Update escapeHtml in HtmlUtils class to create paragraphe when user have \r\n in popup text
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-08-23 09:16:22 +02:00
_Bastler
9790572928
typo
2021-08-23 09:07:07 +02:00
_Bastler
730ca9c71d
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2021-08-23 09:04:30 +02:00
David Négrier
1f7e964a7d
Merge pull request #1386 from thecodingmachine/master
...
Backporting master to develop
2021-08-23 09:01:19 +02:00
_Bastler
2ad0f98f4a
update readme
2021-08-23 08:22:13 +02:00
David Négrier
7e4292f0fd
Merge pull request #1376 from thecodingmachine/deployerFix
...
fix deeployer
2021-08-20 17:11:10 +02:00
David Négrier
9a150cbcca
Merge pull request #1385 from thecodingmachine/images_in_doc
...
Migrating images from the WorkAdventure website to the docs/ directory
2021-08-20 17:10:46 +02:00
David Négrier
821e224aac
Migrating images from the WorkAdventure website to the docs/ directory
...
Images belong to the docs, so they should sit next to the documentation files in the /docs directory.
2021-08-20 16:56:03 +02:00
GRL
edfe440c6e
Merge branch 'develop' of github.com:thecodingmachine/workadventure into menuInSvelte
2021-08-20 16:18:45 +02:00
_Bastler
092a14fa09
update front docker: stun
2021-08-20 12:49:12 +02:00
_Bastler
94328771bf
update production docker stuff
2021-08-20 12:30:33 +02:00
GRL
c2b3d23ec0
Player return a the same position when after editing his profile (same as reconnection)
2021-08-20 09:49:37 +02:00
_Bastler
e82de52a35
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2021-08-19 19:24:24 +02:00
Gregoire Parant
4d4c9c8c6e
Merge branch 'master' into develop
2021-08-19 18:50:34 +02:00
grégoire parant
e32f433688
Update cache version ( #1383 )
...
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-08-19 18:48:24 +02:00
Gregoire Parant
86c32cf9ff
Merge branch 'master' into develop
...
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
# Conflicts:
# front/dist/service-worker-prod.js
2021-08-19 18:31:30 +02:00
grégoire parant
1ffd198b00
Update cache management ( #1382 )
...
Change strategy of cache management. Today we don't have version of map building so we cannot use cache correctly. The idea is to have a less cache and keep HTPP cache management with GET method.
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-08-19 18:23:30 +02:00
GRL
0c796dff90
Player return a the same position when after editing his profile
2021-08-19 17:22:16 +02:00
GRL
2ebf05f7d6
Correction following test
2021-08-19 11:17:46 +02:00
_Bastler
6ff4f4f52e
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2021-08-19 10:36:23 +02:00
_Bastler
4dfc04826e
production tests
2021-08-19 10:09:42 +02:00
David Négrier
5fa8c1de9a
Merge pull request #1379 from thecodingmachine/popup_improvements
...
Improving popup
2021-08-19 09:52:35 +02:00
GRL
d6bd883c94
Third pass on css and reportMenu
2021-08-18 15:34:26 +02:00
David Négrier
8a64491952
Improving popup
...
If a popup message is empty, only the buttons will be displayed (not the container)
Unrelated: the Sound.play method in the API now accepts 0 arguments.
2021-08-18 11:53:41 +02:00
GRL
0d29ef5787
Merge branch 'menuInSvelte' of github.com:thecodingmachine/workadventure into menuInSvelte
2021-08-18 11:30:28 +02:00
GRL
5a8e7d277f
Second pass on css and reportMenu
2021-08-18 11:30:11 +02:00
GRL
ac825bf725
Second pass on css and reportMenu
2021-08-18 11:20:57 +02:00
GRL
4c3097155b
Second pass on css and reportMenu
2021-08-18 11:15:46 +02:00
_Bastler
fc567e76f4
update dependencies, Iframe module loading
2021-08-17 20:33:20 +02:00
Lurkars
f3cfe7ec82
Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop
2021-08-17 20:24:25 +02:00
GRL
9e5cc3b9a7
First pass on css
2021-08-17 15:17:29 +02:00
GRL
096baa8897
First pass on css
2021-08-17 14:44:43 +02:00
grégoire parant
0bfac1a164
Update cache API index ( #1378 )
...
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-08-17 13:26:20 +02:00
_Bastler
123d6fd535
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2021-08-17 11:40:32 +02:00
David Négrier
06be65c12f
Merge pull request #1368 from thecodingmachine/fix_zone_enter_exit
...
Fixing enter/leave event not properly sent on adjacent zones
2021-08-17 10:08:51 +02:00
David Négrier
1d45bab46d
Fixing enter/leave event not properly sent on adjacent zones
...
On adjacent zones, the zone leave event was not properly triggered when leaving a zone for the zone next to it.
Closes #1366
2021-08-17 10:04:11 +02:00
_Bastler
940b08742a
fix audiomanager
2021-08-16 19:37:26 +02:00