lbehm/workadventure
1
0
Fork 0
Code Issues Pull requests Releases Activity
3553 commits 21 branches 1 tag 50 MiB
Commit graph

283 commits

Author SHA1 Message Date
David Négrier 82c2d21423
Merge pull request #1654 from thecodingmachine/feature-camera-management 
Feature camera management
 2022-01-14 11:57:05 +01:00
Hanusiak Piotr 7ee41bad30 change setViewport action to set for CameraAPI 2022-01-14 11:41:37 +01:00
Hanusiak Piotr c2b2385e96 Camera now centers on focusable zone properly 2022-01-13 18:54:38 +01:00
Hanusiak Piotr a164cedf3f Camera FocusTarget width and height are now optional 2022-01-13 16:43:58 +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
Hanusiak Piotr a1c96b0524 merged develop 2022-01-13 10:44:06 +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 58af1f05f7 unlocking zooming with a delay when entering / leaving focusable zone 2022-01-12 12:08:11 +01:00
Benedicte Quimbert d672a2dead WIP API updates for tutorial and more 2022-01-03 11:45:47 +01:00
David Négrier 36ce4f8f29
Merge pull request #1664 from Chasethechicken/layers 
Add missing layer properties
 2021-12-24 16:10:15 +01:00
David Négrier 9efa115982 Merge branch 'master' of github.com:thecodingmachine/workadventure into develop 2021-12-23 11:04:20 +01:00
Chasethechicken 66efdebc78 Fix test map 2021-12-21 23:22:58 +01:00
Chasethechicken 5197428969 Add link to layer visibility test map 2021-12-21 22:24:03 +01:00
Chasethechicken ee46111d3f Add test instructions 
Also make the invisible and alpha layers seperate areas,
to make success more obvious.
 2021-12-21 22:22:26 +01:00
David Négrier 90f7287860 Adding the ability to set the player's color outline via the scripting API 
(currently not shared with the other players yet)
 2021-12-21 17:02:53 +01:00
Chasethechicken ba7ea16799 Add test map 2021-12-21 11:47:43 +01:00
Hanusiak Piotr f8353bd7b5 send camera update event from CameraManager 2021-12-17 11:05:11 +01:00
Hanusiak Piotr 4871b406de test map for Camera API 2021-12-16 16:08:41 +01:00
David Négrier e3cb6d73ca
Merge pull request #1649 from ValdoTR/fix/test-skins 
Added some skins to test the woka related code
 2021-12-15 17:43:35 +01:00
David Négrier e2afb6ec02
Merge pull request #1626 from workadventure-xce/fix/mapProperties 
Display link to map in map credits if provided in map properties
 2021-12-15 17:12:34 +01:00
Hanusiak Piotr 99ffb7b450 merged develop 2021-12-15 15:23:21 +01:00
Valdo Romao be0c70f9ac Added some skins to test the woka related code 2021-12-15 11:11:37 +00:00
David Négrier 0a705eadf9
Merge pull request #1616 from Waclaw-I/feature-camera-zone-focus 
Focusable zones
 2021-12-14 15:43:45 +01:00
Hanusiak Piotr 960c247b20 added documentation for Focusable Zones 2021-12-14 12:03:05 +01:00
David Négrier 8a96ff8ee4
Merge pull request #1614 from ValdoTR/user-room-token 
Added the user-room token created from admin when we access a room
 2021-12-13 17:50:49 +01:00
PizZaKatZe 80794975aa Add new layer property audioCopyright 2021-12-11 22:24:28 +01:00
Hanusiak Piotr 03cf5c05ff added zoom_margin optional property for zone definition 2021-12-08 13:03:25 +01:00
David Négrier 0d5c318040 Adding a test case to test exitSceneUrl property 
this test case reproduces error #1631
 2021-12-07 15:55:26 +01:00
Hanusiak Piotr e97fd1d38c Merge branch 'develop' into feature-camera-zone-focus 2021-12-07 13:20:15 +01:00
Hanusiak Piotr d6be8bc71b revert changes made to the starter/map.json 2021-12-04 17:26:23 +01:00
Hanusiak Piotr 9a81aa83f1 added test map for focusable zones feature 2021-12-04 17:24:39 +01:00
Hanusiak Piotr 37949eda53 working with zoom modifier calculating per zone 2021-12-04 17:11:49 +01:00
Hanusiak Piotr 092daa245f locking zooming via player input 2021-12-04 17:11:49 +01:00
Hanusiak Piotr ef3a7513e2 camera zoom using scaleManager zooming. WIP 2021-12-04 17:11:49 +01:00
Hanusiak Piotr eb95e2e483 detecting zoe enter and leave events 2021-12-04 17:11:49 +01:00
Valdo Romao dd79f7d0f4 Added the user-room token created from admin when we access a room 2021-12-01 15:50:14 +00:00
David Négrier fcf0888864 Adding a reconnect feature in case first Pusher request fails 
Now, if the first pusher request fails, a waiting message will be displayed and the application will reconnect when the pusher comes back alive or the network connection is established again.
 2021-12-01 14:14:02 +01:00
David Négrier f40dda69f4 Fixing missing header extension in new maps image 2021-11-30 11:50:15 +01:00
David Négrier 60475111cc Fixing maps image 2021-11-30 09:15:42 +01:00
David Négrier 41fd848fa0 Fixed potential injection by switching map container to PHP 
Some HTML files were importing iframe_api.js automatically by detecting the referrer document.

While this was done in a safe way (the map container does not use cookies), it is not
a best practice to load a script originating from document.referrer.

This PR solves the issue by using PHP to inject the correct domain name in the HTML files.
 2021-11-29 19:05:13 +01:00
Benedicte Quimbert 99dfd77600 WIP API updates for tutorial and more 2021-11-25 10:55:54 +01:00
David Négrier a82f4e1813 Adding end-to-end tests 
The first test is testing a tricky cache scenario with the back when testing variables.
The end-to-end package used is testcafe.
 2021-11-23 15:43:34 +01:00
Bénédicte Q b9bf27983f
Update maps/tests/TriggerMessageApi/script.js 
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
 2021-11-08 10:51:18 +01:00
Bénédicte Q 7da975749c
Update maps/tests/TriggerMessageApi/script.js 
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
 2021-11-08 10:51:08 +01:00
Benedicte Quimbert f20c39f6a4 wip 2021-11-03 16:51:33 +01:00
Alexis Faizeau e1d454d834 Add enters/leaves layer with api test map 2021-10-29 19:45:03 +02:00
Alexis Faizeau 0b08d9251e Fix link of cowebsite propeerty test map fix 2021-10-29 15:46:05 +02:00
Alexis Faizeau 4538f6d915 Update cowebsite script map 2021-10-25 19:00:26 +02:00
Gregoire Parant 251d14a470 Add new test for cowebsite and jitsi room 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-10-25 19:00:26 +02:00