_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,721 Commits 2 Branches 0 Tags 47 MiB
73ef14bfc0
Commit Graph

2561 Commits

Author SHA1 Message Date
_Bastler
92af014e0f Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-03-22 08:37:18 +01:00
Benedicte Quimbert
216f34c113 switches dropdown for checkboxes and adjusts wording 2022-03-21 19:13:24 +01:00
Piotr 'pwh' Hanusiak
ccf897f320 fixing grid. wip 2022-03-21 16:44:51 +01:00
Valdo
6d9a3f45dc
Allow audio (#1991) 
* Removing old unused images

Just a bit of cleanup!

* Allow audio feature

* Pretty

* Ignored screenshot folder

* Added manual test

* Simplified test map

Co-authored-by: Valdo Romao <v.romao@thecodingmachine.com>
 2022-03-21 16:22:51 +01:00
Piotr 'pwh' Hanusiak
a340c9bd96 simplification of resizing 2022-03-21 14:53:37 +01:00
Benedicte Quimbert
9442c9c9f1 PrivacyShutdownStore modifies constraints according to the user's setting 2022-03-21 14:33:20 +01:00
Benedicte Quimbert
453ccb7745 Adds settings options and localUser functions 2022-03-21 14:33:20 +01:00
Piotr 'pwh' Hanusiak
159bf0351f fighting with not cripsy pixels when resizing 2022-03-21 12:38:12 +01:00
David Négrier
705c75e3c7 Adding wokalist type checking on front 
Additionally, we are making superLoad.json accept a new "immediateCallback" parameter that resolves during the event handler (and not after)
 2022-03-21 11:29:18 +01:00
Gregoire Parant
e618dc6c3d Refactor connexion manager 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-03-20 14:33:25 +01:00
_Bastler
990a246228 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-03-19 20:57:58 +01:00
Gregoire Parant
29a0b9c5ae Refactor access by token 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-03-19 07:11:15 +01:00
David Négrier
6e52f280d0 Properly catching promises 2022-03-18 18:11:32 +01:00
David Négrier
375f78ca30 Adding missing powered by images 2022-03-18 18:11:32 +01:00
David Négrier
9f79e595a5 Migrating Loader bar to SuperLoad and fixing Resize issue on loader 2022-03-18 18:11:32 +01:00
David Négrier
c529658ef4 Adding first version of SuperLoader 
This class is the Phaser loader as it should be: it comes with promises,
can be easily run out of the "preload" phase and won't crash if the
scene is destroyed before textures are loaded.
 2022-03-18 18:11:32 +01:00
David Négrier
ea3088a876 Adding a "powered by WorkAdventure" logo in case custom logos are used 
If a custom logo is used, we are adding a "powered by WorkAdventure" small logo at the bottom of the "enter your name" screen.
 2022-03-18 18:11:32 +01:00
Piotr 'pwh' Hanusiak
cd42f30aa7 hide voice indicator for player leaving still existing bubble conversation 2022-03-18 17:58:41 +01:00
David Négrier
6890e2579c Removing old unused images 
Just a bit of cleanup!
 2022-03-18 17:58:41 +01:00
Piotr 'pwh' Hanusiak
a10f327f45 hide voice indicator for player leaving still existing bubble conversation 2022-03-18 17:46:28 +01:00
Alexis Faizeau
539a273263
Revert "Stabilize screensharing (#1982)" (#1984) 
This reverts commit 33e78060d4.
 2022-03-18 17:37:02 +01:00
Alexis Faizeau
15a0a2d1eb Add check if cowebsite still exist before highlight 2022-03-18 16:44:15 +01:00
Alexis Faizeau
c51fe1cfed
Translate camera help (#1983) 
Co-authored-by: Alexis Faizeau <a.faizeau@workadventu.re>
 2022-03-18 11:50:48 +01:00
Alexis Faizeau
9c99d760f7 Close socket connection on not authorized woka 2022-03-18 11:49:41 +01:00
Alexis Faizeau
33e78060d4
Stabilize screensharing (#1982) 
Co-authored-by: Alexis Faizeau <a.faizeau@workadventu.re>
 2022-03-17 17:50:39 +01:00
Piotr 'pwh' Hanusiak
9a7e5cae4c populate grid on resize 2022-03-17 16:48:40 +01:00
Piotr 'pwh' Hanusiak
744c15920b fixed bug with animation not showing up to date state of the outfit 2022-03-17 15:49:05 +01:00
Piotr 'pwh' Hanusiak
a3fcf2dc3f populating grid 2022-03-17 13:58:54 +01:00
Piotr 'pwh' Hanusiak
701c5f65cd independent parts preview 2022-03-17 11:58:12 +01:00
Piotr 'pwh' Hanusiak
7703a76689 show body parts previews 2022-03-17 11:03:04 +01:00
Gregoire Parant
56fb73c682 Change roomId by playUri 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-03-17 10:53:56 +01:00
Gregoire Parant
0e7a52aa58 update with dan suggest 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-03-17 10:38:52 +01:00
Gregoire Parant
5448596f01 Merge branch 'develop' into changeRegisterAccess 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

# Conflicts:
#	pusher/src/Services/AdminApi.ts
 2022-03-17 09:54:24 +01:00
David Négrier
37e824c494 Fixing setInterval not freed for some volume analyzers 
Also: using a 256 fftSize instead of 2048 to save on CPU cycles.
 2022-03-16 15:34:39 +01:00
Piotr 'pwh' Hanusiak
a22504b354 fix bug with grid not showing starting positions on resize 2022-03-16 15:05:47 +01:00
Piotr 'pwh' Hanusiak
ac48a42903 further work on vertical layout 2022-03-16 14:05:35 +01:00
Piotr 'pwh' Hanusiak
fb020e22c7 entirely different approach to layout 2022-03-16 13:25:39 +01:00
David Négrier
53b184e82b Adding support for custom logos 
The admin can now set custom logos for the login scene and for the loading screen.
 2022-03-15 18:16:56 +01:00
David Négrier
79db6c8f3b Fixing a race condition in Jitsi 
When setting the name, in rare cases, Jitsi was not initialized yet and setting the name would cause a JS error.
We are now waiting for Jitsi to be properly initialized before setting the name.
 2022-03-15 17:50:56 +01:00
_Bastler
9c4e4f08f8 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-03-15 14:14:11 +01:00
David Négrier
b959ce7a6d Migrating some promises to Deferred objects to simplify the code. 2022-03-15 13:51:36 +01:00
David Négrier
153bffd521 Wait for main character to be loaded to display the GameScene 
This change makes sure the character of the current player is fully loaded before we display the game scene.
Otherwise, you could have a glitch for 0.5-2 seconds between the GameScene being displayed and the actual character being displayed.
 2022-03-15 13:51:36 +01:00
David Négrier
3988559d2a Removing old unused images 
Just a bit of cleanup!
 2022-03-15 13:51:10 +01:00
Piotr 'pwh' Hanusiak
43bac6c5cf get rid of zoom factor 2022-03-15 11:31:01 +01:00
David Négrier
b6b6c7f15f Adding error case when texture is empty 2022-03-14 14:28:42 +01:00
David Négrier
352f144e97
Merge pull request #1963 from thecodingmachine/develop 
Deploy 2022-03-14
 2022-03-14 13:01:10 +01:00
_Bastler
9eec503215 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-03-14 10:33:34 +01:00
Piotr Hanusiak
d4dcd0d5ce
Actions menu api (#1862) 
* wip

* wip

* random action on click

* removing actions

* register single key per command use

* change removeActionsMenu action name

* fixed actions menu not hiding content properly:

* actions menu fix

* added mock Block Player action

* ActionsMenu buttons styling

* added displaying priority for menu actions

* moved utils actionMenu features to the UI

* import as a type:

* more object oriented style for API

* removed registered actions from RemotePlayer instance

* readme update

* Fixing typos / Improving wording

* added instructions on AlterActionsMenu test map

Co-authored-by: Hanusiak Piotr <piotr@ltmp.co>
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
 2022-03-14 10:15:10 +01:00
Lurkars
55db6a9b12
apply textures on openid login, fix pusher errors on woka list (#1961) 
* apply textures on openid login, fix pusher errors on woka list

* remove logging

* Returning a HTTP 400 id roomUrl parameter not set

Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
 2022-03-14 10:14:35 +01:00
_Bastler
df094d30a2 fix woka-list 2022-03-13 15:49:21 +01:00
_Bastler
366231df98 textures on auth 2022-03-13 09:27:35 +01:00
_Bastler
0e1ba49a3e Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-03-13 09:25:25 +01:00
David Négrier
6540f15c5b
Refactoring Woka management (#1810) 
* Wrap websockets with HyperExpress

* Add endpoints on pusher to resolve wokas

* getting textures urls from pusher

* Adding OpenAPI documentation for the pusher.

The pusher now exposes a "/openapi" endpoint and a "/swagger-ui/" endpoint.

* revert FRONT_URL

* playerTextures metadata is being loaded via Phaser.Loader

* fetch textures every time character or customize scene is open

* Heavy changes: refactoring the pusher to always send the textures (and the front to accept them)

* Sending character layer details to admin

* Cleaning commented code

* Fixing regex

* Fix woka endpoints on pusher

* Change error wording on pusher

* Working on integration of the woka-list with the new admin endpoint.

* Switching from "name" to "id" in texture object + using zod for woka/list validation

* Add position on default woka data

* Remove async on pusher option method

* Fix woka list url

* add options for /register

* Fxiing loading the Woka list

* Actually returning something in logout-callback

* Copying messages to back too

* remove customize button if no body parts are available (#1952)

* remove customize button if no body parts are available

* remove unused position field from PlayerTexturesCollection interface

* removed unused label field

* fix LocalUser test

* little PlayerTextures class refactor

* Fixing linting

* Fixing missing Openapi packages in prod

* Fixing back build

Co-authored-by: Hanusiak Piotr <piotr@ltmp.co>
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>

* Add returns on pusher endpoints

Co-authored-by: Alexis Faizeau <a.faizeau@workadventu.re>
Co-authored-by: Hanusiak Piotr <piotr@ltmp.co>
Co-authored-by: Piotr Hanusiak <wacneg@gmail.com>
 2022-03-11 17:02:58 +01:00
Piotr 'pwh' Hanusiak
9644512d68 different animations for previewer 2022-03-11 16:05:39 +01:00
Piotr 'pwh' Hanusiak
6d50d15630 different approach for displaying preview 2022-03-11 15:21:51 +01:00
Piotr Hanusiak
2a73400f7c
remove customize button if no body parts are available (#1952) 
* remove customize button if no body parts are available

* remove unused position field from PlayerTexturesCollection interface

* removed unused label field

* fix LocalUser test

* little PlayerTextures class refactor

* Fixing linting

* Fixing missing Openapi packages in prod

* Fixing back build

Co-authored-by: Hanusiak Piotr <piotr@ltmp.co>
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
 2022-03-11 14:30:00 +01:00
Piotr 'pwh' Hanusiak
138e8aece4 better woka preview, wip 2022-03-11 13:36:55 +01:00
David Négrier
4ebb25e6ea Merge branch 'develop' of github.com:thecodingmachine/workadventure into refactor_wokas 2022-03-11 11:55:30 +01:00
Hanusiak Piotr
9f823506b9 little PlayerTextures class refactor 2022-03-10 16:18:47 +01:00
Hanusiak Piotr
5a8cba24fa much cleaner approach to group lock update 2022-03-10 12:20:53 +01:00
Hanusiak Piotr
060cdf3310 fix LocalUser test 2022-03-10 09:50:41 +01:00
Hanusiak Piotr
b3e896d9fc removed unused label field 2022-03-10 09:24:31 +01:00
_Bastler
4e6a622546 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-03-09 20:29:52 +01:00
Hanusiak Piotr
3a5aa3c3c5 cr fixes #1 wip 2022-03-09 16:51:11 +01:00
Hanusiak Piotr
fb05037594 remove unused position field from PlayerTexturesCollection interface 2022-03-09 14:11:15 +01:00
Hanusiak Piotr
e5095db048 remove customize button if no body parts are available 2022-03-09 12:45:04 +01:00
David Négrier
674c5bdeb8 Fxiing loading the Woka list 2022-03-09 11:22:33 +01:00
Piotr Hanusiak
0196eae055
async call for recalculating tiles costs (#1890) 
* async call for recalculating tiles costs

* fixed setWalkingCostGrid still being a blocking process

* set exits tiles cost from the start

* removed typing error from code

Co-authored-by: Hanusiak Piotr <piotr@ltmp.co>
 2022-03-08 16:28:54 +01:00
_Bastler
0d4091c431 unused import 2022-03-08 15:20:00 +01:00
_Bastler
633d56fc67 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-03-08 15:17:37 +01:00
Lukas
7b26d16868
lazy load EmoteMenu (#1938) 2022-03-08 11:56:34 +01:00
_Bastler
bc33d88726 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-03-07 19:06:17 +01:00
David Négrier
07a4df8ad4 Importing Window object back in Iframe API 2022-03-07 18:35:17 +01:00
Alexis Faizeau
9300b05335 Fix woka list url 2022-03-04 10:52:32 +01:00
Hanusiak Piotr
3c74b2b554 remove obsolete check 2022-03-03 15:21:44 +01:00
Anton Bracke
4535a8ae96
Merge remote-tracking branch 'upstream/develop' into electron 2022-03-03 14:43:33 +01:00
Hanusiak Piotr
363b906cb8 group circles with color fill 2022-03-03 14:36:16 +01:00
Hanusiak Piotr
a0535ed4a8 Updating GroupDescriptors on LockGroupMessage 2022-03-03 12:22:16 +01:00
Hanusiak Piotr
a0205bf682 cleanup 2022-03-02 17:00:43 +01:00
Hanusiak Piotr
ef22d4ba20 listening to lockGroupMessage on front 2022-03-02 10:44:26 +01:00
Hanusiak Piotr
d43c8d181a sending info about group lock state. wip 2022-03-01 11:36:45 +01:00
_Bastler
e87052ecc6 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-28 19:12:42 +01:00
_Bastler
6faa31427b fix iframe 2022-02-28 14:52:44 +01:00
Hanusiak Piotr
724dbc8efa send group userIds to players 2022-02-28 13:47:08 +01:00
Lurkars
0a2bfc556f Merge branch 'develop' of github.com:thecodingmachine/workadventure into oidcProfile 2022-02-28 10:35:15 +01:00
_Bastler
51719660d9 Merge branch 'develop' of ssh://git.bstly.de:222/_Bastler/partey_workadventure 2022-02-27 14:39:42 +01:00
_Bastler
86dc0d4aa8 add DOMPurify 2022-02-27 14:37:26 +01:00
_Bastler
9e86e95135 merge latest dev 2022-02-27 14:19:39 +01:00
_Bastler
2622041740 orig. formatting 2022-02-27 13:59:05 +01:00
_Bastler
0e1dff6a11 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop_vite 2022-02-26 11:11:51 +01:00
David Négrier
08fffab410 Switching from "name" to "id" in texture object + using zod for woka/list validation 2022-02-25 17:05:34 +01:00
_Bastler
7e9196a8a0 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop_vite 2022-02-25 14:16:19 +01:00
David Négrier
da469b64d2 Working on integration of the woka-list with the new admin endpoint. 2022-02-24 21:09:19 +01:00
David Négrier
378a95962a Heavy changes: refactoring the pusher to always send the textures (and the front to accept them) 2022-02-23 21:13:11 +01:00
Hanusiak Piotr
d65fe0ee26 fetch textures every time character or customize scene is open 2022-02-23 19:53:55 +01:00
Hanusiak Piotr
063de6d1ca playerTextures metadata is being loaded via Phaser.Loader 2022-02-23 19:53:55 +01:00
Hanusiak Piotr
52e15eccfa revert FRONT_URL 2022-02-23 19:53:54 +01:00
Hanusiak Piotr
80761804a7 getting textures urls from pusher 2022-02-23 19:53:54 +01:00
Alexis Faizeau
2161a40e05 Add endpoints on pusher to resolve wokas 2022-02-23 19:53:54 +01:00
_Bastler
ac4f16ad03 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop_vite 2022-02-23 17:07:14 +01:00
_Bastler
021a2511e0 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop_vite 2022-02-23 16:59:15 +01:00
Hanusiak Piotr
8d8857011e removed unused imports 2022-02-23 14:40:19 +01:00
Hanusiak Piotr
9fe4782fbd clear hashParams after moving player with moveTo param 2022-02-23 10:14:09 +01:00
Gregoire Parant
07d399403b Refactor how to use new Jitsi icon 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-02-23 00:27:07 +01:00
Gregoire Parant
658781e02e Merge branch 'master' into develop 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

# Conflicts:
#	front/public/resources/logos/meet.svg
 2022-02-22 23:40:48 +01:00
Anton Bracke
4e243151dd
add desktop api to front 2022-02-22 16:57:56 +01:00
Gregoire Parant
0943ec8991 Define color text by brightness 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-02-21 01:09:53 +01:00
Gregoire Parant
070ad6b993 Add jiti logo for Jitsi button meeting 2022-02-20 23:38:20 +01:00
Gregoire Parant
23f7d6f08f Update CoWebsite Jitsi 
- Change Jitsi meeting icon
 - Add Jitsi meeting information

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-02-20 23:28:27 +01:00
_Bastler
667e3c0944 Merge branch 'develop' of ssh://git.bstly.de:222/_Bastler/partey_workadventure 2022-02-20 13:28:29 +01:00
Lukas Hass
3ee9b26650
use optional chaining 2022-02-19 20:25:17 +01:00
Lukas Hass
e8d5335bc0
Merge branch 'develop' into vite 2022-02-19 20:08:50 +01:00
_Bastler
7701e44715 Merge branch 'develop' of ssh://git.bstly.de:222/_Bastler/partey_workadventure 2022-02-19 10:15:56 +01:00
Lukas Hass
cc24fd48d5
update generic-type-guard and @geprog/vite-plugin-env-config 
allows to get rid of node built-in polyfills
 2022-02-19 00:13:25 +01:00
Gregoire Parant
e4f9f89a40 Fix pretty 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-02-18 21:57:11 +01:00
Gregoire Parant
26f5416b63 Fix svelt check 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-02-18 21:44:17 +01:00
Gregoire Parant
3a734cc2ae Enable limitation freemium 
- Fix warning message
 - Fix post message API pusher

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-02-18 21:33:23 +01:00
_Bastler
136269170d Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-18 09:56:05 +01:00
Lukas Hass
2755489ccf
Merge branch 'develop' into vite 2022-02-17 15:20:58 +01:00
Lukas Hass
c163107875
import browserified version of simple-peer 2022-02-17 15:02:48 +01:00
Hanusiak Piotr
ecd4b5907a disable corner cutting 2022-02-17 12:44:57 +01:00
Alexis Faizeau
f186111d2f Fix importing coWesbite from API to store 2022-02-17 09:51:32 +01:00
_Bastler
b1728b7b8c Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-16 20:25:12 +01:00
Gregoire Parant
f0c7e4ea8a Update css warning message & add message button 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-02-16 20:15:16 +01:00
David Négrier
eae6c2c5e3
Merge pull request #1887 from thecodingmachine/master 
Backporting cowebsites hot-fixes
 2022-02-16 18:03:23 +01:00
David Négrier
a7264954ea
Merge pull request #1820 from thecodingmachine/feature-voice-chat-indicator 
Feature voice chat indicator
 2022-02-16 16:46:13 +01:00
Hanusiak Piotr
e590cee753 forcing close talkIcon indicator when leaving bubble conversation 2022-02-16 15:55:07 +01:00
Hanusiak Piotr
0b0d3b5beb fixed issue with chat indicator persisting after being out of conversation 2022-02-16 14:56:59 +01:00
Hanusiak Piotr
dea5784c9b Merge branch 'develop' into feature-voice-chat-indicator 2022-02-16 14:37:01 +01:00
Hanusiak Piotr
3c54e38401 unlock diagonal movement 2022-02-16 14:28:35 +01:00
Hanusiak Piotr
3875d3b0f5 Merge branch 'develop' into avoid-exits-on-path 2022-02-16 14:03:48 +01:00
_Bastler
dca2cc3c6c Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-16 09:16:54 +01:00
Lurkars
2816946c94 add OIDC username + locale 2022-02-16 09:11:08 +01:00
Lukas Hass
620e218612
remove iframe.html 2022-02-15 20:19:45 +01:00
Alexis Faizeau
06dd2202f6 Fix hidden main cowebsite swape 2022-02-15 17:28:15 +01:00
Alexis Faizeau
a52ad233d8 Fix cowebsite swap 2022-02-15 17:28:02 +01:00
Alexis Faizeau
0f16d909e7 The second opened cowebsite must be displayed on highlighted 2022-02-15 17:27:32 +01:00
Lukas Hass
cdc3d182bc
fix comparison that is always false 2022-02-15 12:00:32 +01:00
Lukas Hass
8c96a986fb
remove webpack reference 2022-02-15 11:07:04 +01:00
_Bastler
9cfe75f4d1 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-15 08:14:24 +01:00
_Bastler
d63a32e94e Co-Wesbite 2022-02-15 08:13:53 +01:00
Lukas Hass
ae8c18fa4b
prevent reading property 'collides' of undefined 
fixes e2e tests
 2022-02-14 22:07:15 +01:00
Lukas Hass
ae46a1faf1
Merge branch 'develop' into vite 2022-02-14 19:47:27 +01:00
David Négrier
7a44f3dcb8
Merge pull request #1853 from anbraten/remove-external-deps 
Bundle nes.css and quill-js
 2022-02-14 18:46:19 +01:00
David Négrier
9bfce8412a Adding a missing translation for "Visiting card" 
Also, changing "Visiting Card" to "Business Card" in English
 2022-02-14 16:00:53 +01:00
_Bastler
5451fc788d Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-14 12:57:46 +01:00
Hanusiak Piotr
639c456540 use png instead of svg for talk icon 2022-02-14 10:37:13 +01:00
Anton Bracke
aef64afdb9
fix quill import 2022-02-13 20:20:38 +01:00
Lukas Hass
29cdb1a8e5
Merge branch 'develop' into vite 2022-02-13 11:46:26 +01:00
Lurkars
7da4fd7da6 merge latest translations 2022-02-12 14:37:25 +01:00
_Bastler
fe2ed33d5f Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-12 13:36:30 +01:00
David Négrier
e85f94998f Merge branch 'develop' of github.com:thecodingmachine/workadventure into feature-voice-chat-indicator 2022-02-11 18:40:03 +01:00
David Négrier
0b82df0d41 Merge branch 'develop' of github.com:thecodingmachine/workadventure into move-to-improvements 2022-02-11 16:58:40 +01:00
David Négrier
80bfeb823e
Merge pull request #1852 from thecodingmachine/stabilize-cowebsite 
Stabilize cowebsite
 2022-02-11 16:05:19 +01:00
Anton Bracke
51f7ce10e1
remove extenal quill import 2022-02-11 15:53:52 +01:00
David Négrier
62f8a131a9 Adding translation for "Walk automatically to my position" 2022-02-11 15:52:24 +01:00
David Négrier
664cce87b8 Improving rendering of share screen 2022-02-11 15:37:23 +01:00
Alexis Faizeau
5137190558 Change cowebsite closing animation 2022-02-11 15:06:41 +01:00
Alexis Faizeau
b7f4c0eecc Fix bad type base i18n translations 2022-02-10 19:30:41 +01:00
Alexis Faizeau
a5e0c2a9cf Add main cowebsite minimize indicator 2022-02-10 19:30:41 +01:00
Alexis Faizeau
b0c0d22f25 Translate game map properties trigger messages 2022-02-10 17:30:03 +01:00
Hanusiak Piotr
65fb15704e calculate cost for exit tiles 2022-02-10 17:15:33 +01:00
Alexis Faizeau
460d67534a Move all game scene game map properties listeners 2022-02-10 17:02:10 +01:00
Hanusiak Piotr
66375e6d53 merged develop 2022-02-10 16:00:56 +01:00
_Bastler
da81a712b9 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-10 15:55:36 +01:00
Alexis Faizeau
aa9b5e37c7
Merge pull request #1850 from thecodingmachine/stabilize-cowebsite 
Fix Jitsi co-website reloading
 2022-02-10 15:50:59 +01:00
Alexis Faizeau
666b6df588 Fix Jitsi co-website reloading 2022-02-10 15:37:04 +01:00
_Bastler
9f6158728a Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-10 14:02:31 +01:00
David Négrier
b851dd1f52
Merge pull request #1838 from thecodingmachine/stabilize-cowebsite 
Fix cowebsite closing on fast opening/closing
 2022-02-10 12:16:04 +01:00
Alexis Faizeau
7b6a3949bc Move CoWebsite to generic class 2022-02-10 11:47:56 +01:00
_Bastler
71431165d6 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-10 08:35:25 +01:00
Hanusiak Piotr
c58eeb8a0f Merge branch 'develop' into feature-voice-chat-indicator 2022-02-09 14:02:44 +01:00
Hanusiak Piotr
c13672c9dc updated invitation link creator 2022-02-09 13:03:14 +01:00
Hanusiak Piotr
b565080312 parse x and y position from moveTo param 2022-02-09 10:52:44 +01:00
Hanusiak Piotr
fe570c9117 moveTo object position 2022-02-09 10:17:31 +01:00
Hanusiak Piotr
20267d3483 Merge branch 'develop' into fix-issue-1835 2022-02-09 09:35:43 +01:00
Gregoire Parant
cfbf9dca23 PlayUri parameter 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-02-08 20:31:08 +01:00
Gregoire Parant
64ba7575a0 Add play uri param 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-02-08 18:47:11 +01:00
Hanusiak Piotr
b32a2970e4 collisionGrid now updates on showing / hiding layers 2022-02-08 15:46:41 +01:00
Hanusiak Piotr
9cfebecde2 parallaxx and parallaxy made optional 2022-02-08 13:32:02 +01:00
Hanusiak Piotr
57bd8783e0 scroll factor applied automatically 2022-02-08 13:17:35 +01:00
Hanusiak Piotr
d6f0c19838 cr fixes #1 2022-02-08 11:54:18 +01:00
_Bastler
88e20290bd fix svelte world 2022-02-08 11:20:51 +01:00
Alexis Faizeau
f5f71f32ee Fix cowebsite closing on fast opening/closing 2022-02-08 11:19:29 +01:00
Hanusiak Piotr
a53cbbff34 create test map 2022-02-08 11:04:12 +01:00
Hanusiak Piotr
6f7bdf8fe4 hide talk-clouds if conversation is over 2022-02-08 10:23:07 +01:00
_Bastler
a2e50dcd95 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-07 19:56:57 +01:00
Gregoire Parant
876ddc87d2 Change accès token with query privateAccessToken in the url 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-02-07 19:26:34 +01:00
Alexis Faizeau
7334d59c4f Remove priority on iframe add to cowebsites 2022-02-07 18:41:24 +01:00
Alexis Faizeau
5dc3fbcce5
Merge pull request #1833 from thecodingmachine/stabilize-cowebsite 
Fix multi cowebsite creation by trigger
 2022-02-07 18:24:04 +01:00
Alexis Faizeau
c770846558 Fix multi cowebsite creation by trigger 2022-02-07 18:23:02 +01:00
David Négrier
41183e8bc2
Merge pull request #1828 from thecodingmachine/stabilize-cowebsite 
Restore trigger message action on co-websites
 2022-02-07 17:58:44 +01:00
Alexis Faizeau
21c198a882
Merge pull request #1831 from thecodingmachine/fix-language-display 
Somes bugs due to i18n implementation
 2022-02-07 17:33:59 +01:00
Alexis Faizeau
433d3a20c6 Fix raw html not displayed buy terms translation key 2022-02-07 17:32:05 +01:00
Alexis Faizeau
c2da4c3906 Fix active custom menu button 2022-02-07 17:25:55 +01:00
Alexis Faizeau
75d42209f4 Hide main cowebsite 2022-02-07 17:09:52 +01:00
Hanusiak Piotr
330b6ea1c5 prettier 2022-02-07 15:10:20 +01:00
Hanusiak Piotr
e34a72c865 merged develop 2022-02-07 15:09:18 +01:00
Alexis Faizeau
60c17ecea2 Re-implement set width of main cowebsite 2022-02-07 14:55:51 +01:00
_Bastler
8a8abd2961 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-07 14:40:09 +01:00