Commit Graph

3830 Commits

Author SHA1 Message Date
_Bastler 93fbc47c5e Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-19 11:34:13 +01:00
David Négrier a2b52a2876 Merge pull request #1733 from thecodingmachine/dependabot/npm_and_yarn/messages/shelljs-0.8.5
Bump shelljs from 0.8.4 to 0.8.5 in /messages
2022-01-19 09:05:06 +01:00
_Bastler 24aaa4582f Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-17 08:21:06 +01:00
dependabot[bot] 5b186c1bba Bump shelljs from 0.8.4 to 0.8.5 in /messages
Bumps [shelljs](https://github.com/shelljs/shelljs) from 0.8.4 to 0.8.5.
- [Release notes](https://github.com/shelljs/shelljs/releases)
- [Changelog](https://github.com/shelljs/shelljs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/shelljs/shelljs/compare/v0.8.4...v0.8.5)

---
updated-dependencies:
- dependency-name: shelljs
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-15 06:59:54 +00:00
David Négrier ccfe049e6c Merge pull request #1723 from thecodingmachine/fix-group
Change group radius management
2022-01-14 13:53:15 +01:00
David Négrier 6269ba997b Merge pull request #1730 from thecodingmachine/camera-api-docs-update
api-camera docs update
2022-01-14 13:17:52 +01:00
Hanusiak Piotr a344d8c2bc api-camera docs update 2022-01-14 12:38:16 +01:00
David Négrier 82c2d21423 Merge pull request #1654 from thecodingmachine/feature-camera-management
Feature camera management
2022-01-14 11:57:05 +01:00
Alexis Faizeau cd566e43a7 Change group radius management 2022-01-14 11:53:33 +01:00
Hanusiak Piotr 7ee41bad30 change setViewport action to set for CameraAPI 2022-01-14 11:41:37 +01:00
Hanusiak Piotr 17e9c3c586 handle instant camera view change 2022-01-14 11:31:49 +01:00
_Bastler ed28cd0882 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-14 10:43:49 +01:00
David Négrier 391c34d0c9 Merge pull request #1729 from thecodingmachine/dependabot/npm_and_yarn/pusher/follow-redirects-1.14.7
Bump follow-redirects from 1.14.4 to 1.14.7 in /pusher
2022-01-14 10:43:18 +01:00
David Négrier 0abdf9faf8 Merge pull request #1728 from thecodingmachine/dependabot/npm_and_yarn/back/follow-redirects-1.14.7
Bump follow-redirects from 1.14.6 to 1.14.7 in /back
2022-01-14 10:43:08 +01:00
_Bastler 15db3e3704 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-14 10:36:39 +01:00
dependabot[bot] 201d804d98 Bump follow-redirects from 1.14.4 to 1.14.7 in /pusher
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.4 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.4...v1.14.7)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-14 09:27:12 +00:00
dependabot[bot] 57b2b4e9fe Bump follow-redirects from 1.14.6 to 1.14.7 in /back
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.6 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.6...v1.14.7)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-14 09:27:10 +00:00
David Négrier f39f13b2dd Merge pull request #1727 from thecodingmachine/dependabot/npm_and_yarn/front/follow-redirects-1.14.7
Bump follow-redirects from 1.14.4 to 1.14.7 in /front
2022-01-14 10:26:39 +01:00
dependabot[bot] 8c11db1f62 Bump follow-redirects from 1.14.4 to 1.14.7 in /front
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.4 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.4...v1.14.7)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-14 07:50:10 +00:00
Hanusiak Piotr c2b2385e96 Camera now centers on focusable zone properly 2022-01-13 18:54:38 +01:00
_Bastler 2f16ec51e4 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-13 16:56:39 +01:00
Hanusiak Piotr a164cedf3f Camera FocusTarget width and height are now optional 2022-01-13 16:43:58 +01:00
Hanusiak Piotr d99930a67e save last zoom value if setting the camera viewport without locking it 2022-01-13 16:17:49 +01:00
Hanusiak Piotr d62b116e5d merge setPosition and focusOn into setViewport 2022-01-13 16:08:16 +01:00
David Négrier 57d2dec756 Merge pull request #1724 from thecodingmachine/master
Backport fix 2022-01-13
2022-01-13 15:59:54 +01:00
_Bastler 22bfe8bc71 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-13 13:30:09 +01:00
Hanusiak Piotr a1c96b0524 merged develop 2022-01-13 10:44:06 +01:00
David Négrier 7b08429db3 Merge pull request #1719 from thecodingmachine/focusable-zone-allow-zoom
Focusable zone allow zoom
2022-01-12 18:51:17 +01:00
David Négrier 242411889a Merge pull request #1722 from thecodingmachine/allow_disabling_modules
Adding a new property to prevent script from being loaded in "modules" mode
2022-01-12 18:49:00 +01:00
David Négrier 9425fd70c0 Adding a new property to prevent script from being loaded in "modules" mode
Scripts in module mode need to be abide by the Same Origin Policy (CORS headers are used to load them)
This can cause issues on some setups.

This commit adds a new "scriptDisableModuleSupport" that can be used to disable the "modules" mode.

Closes #1721
2022-01-12 17:36:31 +01:00
Hanusiak Piotr 905bd079ec camera is now properly focusing on target when zooming, if any 2022-01-12 12:58:27 +01:00
Hanusiak Piotr 58af1f05f7 unlocking zooming with a delay when entering / leaving focusable zone 2022-01-12 12:08:11 +01:00
_Bastler 04a334c8e7 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-12 10:56:50 +01:00
_Bastler f9f2370afb fix firefox private 2022-01-12 10:56:47 +01:00
Alexis Faizeau 3f3f488924 Merge pull request #1718 from thecodingmachine/master
Hot fixes
2022-01-12 10:47:27 +01:00
grégoire parant 55da4d5f20 Merge pull request #1717 from thecodingmachine/HotFixHtaccess
HotFix htaccess to accespt "*"
2022-01-12 08:39:55 +01:00
Gregoire Parant 2f4e518f17 HotFix Htaccess to accespt "*"
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-01-12 08:20:54 +01:00
_Bastler fa4cd34c49 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-11 08:42:54 +01:00
David Négrier 376af7d28d Merge pull request #1714 from jonnytest1/hash-reset
always set hash
2022-01-10 17:39:13 +01:00
_Bastler 7a12e48e70 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-10 15:42:59 +01:00
jonny 786448a2b2 prettier fix 2022-01-09 23:21:07 +01:00
jonny 73ab4f3a26 prettier fix 2022-01-09 23:18:38 +01:00
jonny e5afac1df5 prettier fix 2022-01-09 23:17:17 +01:00
David Négrier e298a35efb Merge pull request #1712 from albanbruder/fix-dump-serialization
Fix circular serialization in pusher dump endpoint
2022-01-09 22:39:38 +01:00
jonny 954d39bb0c always set hash 2022-01-09 13:51:44 +01:00
Alban Bruder 4a78e449df Fix circular serialization in pusher dump endpoint 2022-01-07 14:37:44 +01:00
_Bastler 5cc573ac49 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-07 09:59:00 +01:00
David Négrier adac0df05d Merge pull request #1710 from thecodingmachine/fix_startup
Fix pusher and back locked
2022-01-06 19:29:21 +01:00
David Négrier 996adc6b59 Fix pusher and back locked
Due to the "messages" container changing .ts files at the very same time Typescript is compiling, ts-node-dev can end up in a "locked" state.
This is a bug in ts-node-dev.

To avoid issues, I am adding a small 5 seconds delay in pusher and back startup. This should allow (at least on my hardware) enough time for messages to be generated.
2022-01-06 18:53:45 +01:00
David Négrier 201332bfc8 Merge pull request #1709 from thecodingmachine/fix_close_webites
Fixing closing of all websites.
2022-01-06 18:25:13 +01:00