Commit Graph

1373 Commits

Author SHA1 Message Date
Piotr 'pwh' Hanusiak
dae8619a6b Merge branch 'refactor_wokas' into new_custom_woka_scene 2022-03-22 15:05:33 +01:00
Piotr 'pwh' Hanusiak
87034a453e set starting parts on 0 indices 2022-03-22 14:39:47 +01:00
Piotr 'pwh' Hanusiak
11a262b178 make sure horizontal iPhoneX displays view properly 2022-03-22 13:37:41 +01:00
Piotr 'pwh' Hanusiak
d971c7e064 randomize and finish buttons 2022-03-22 11:56:22 +01:00
Piotr 'pwh' Hanusiak
2cf55cac7e crispy pixels 2022-03-22 09:44:26 +01:00
Piotr 'pwh' Hanusiak
ccf897f320 fixing grid. wip 2022-03-21 16:44:51 +01:00
Piotr 'pwh' Hanusiak
a340c9bd96 simplification of resizing 2022-03-21 14:53:37 +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
David Négrier
6e52f280d0 Properly catching promises 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
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
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
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
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
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
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
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
b3e896d9fc removed unused label field 2022-03-10 09:24:31 +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
Alexis Faizeau
9300b05335 Fix woka list url 2022-03-04 10:52:32 +01:00
Hanusiak Piotr
363b906cb8 group circles with color fill 2022-03-03 14:36: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
Hanusiak Piotr
724dbc8efa send group userIds to players 2022-02-28 13:47:08 +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
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
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
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
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
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
Lukas Hass
3ee9b26650
use optional chaining 2022-02-19 20:25:17 +01:00
Lukas Hass
2755489ccf
Merge branch 'develop' into vite 2022-02-17 15:20:58 +01:00
Alexis Faizeau
f186111d2f Fix importing coWesbite from API to store 2022-02-17 09:51:32 +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
3875d3b0f5 Merge branch 'develop' into avoid-exits-on-path 2022-02-16 14:03:48 +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
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
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
Hanusiak Piotr
639c456540 use png instead of svg for talk icon 2022-02-14 10:37:13 +01:00
Lukas Hass
29cdb1a8e5
Merge branch 'develop' into vite 2022-02-13 11:46:26 +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
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
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
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
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
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
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
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
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
Hanusiak Piotr
c29ce6e9a9 prettier 2022-02-07 14:23:34 +01:00
Hanusiak Piotr
d480150728 cleaner approach to disable activatablesManager distance check if space-event 2022-02-07 14:22:43 +01:00
Hanusiak Piotr
4bae6e75b1 enable activating by distance if in JITSI and JITSI was already opened 2022-02-07 12:37:59 +01:00
Hanusiak Piotr
aec7790875 disable activation by distance if in JITSI 2022-02-07 12:36:33 +01:00
Alexis Faizeau
9571a52f1e Re-implement action message on cowebsite trigger 2022-02-07 11:21:04 +01:00
Hanusiak Piotr
bf0d2eb412 directional shift for current player when trying to activate entities 2022-02-07 11:08:52 +01:00
Hanusiak Piotr
72b4438d1e outline color is decided from particular system level 2022-02-07 10:39:03 +01:00
Alexis Faizeau
6863fa3764 Fix game unfocusable after clicking on iframe 2022-02-04 14:46:57 +01:00
Hanusiak Piotr
d087bc02e9 TalkIcon animation 2022-02-03 16:00:29 +01:00
Hanusiak Piotr
40aae25e11 listen to local volume change only if in bubble conversation 2022-02-03 13:43:20 +01:00
Hanusiak Piotr
4424c7cce1 prevent SoundMeter from being initialized if stream has no audio tracks available 2022-02-03 12:58:31 +01:00
Hanusiak Piotr
e0f5529fa7 catch no audio track error 2022-02-03 12:21:30 +01:00
Alexis Faizeau
4a9cc57d60 Cancelable companion resource 2022-02-03 11:17:11 +01:00
David Négrier
9696b0ab04
Merge pull request #1818 from thecodingmachine/fix-character-collider
applied proper offset for circle collider of Character
2022-02-03 10:25:42 +01:00
Hanusiak Piotr
010c176708 applied proper offset for circle collider of Character 2022-02-03 10:13:17 +01:00
Hanusiak Piotr
be60d0ef03 fixed actions-menu not appearing 2022-02-03 09:50:52 +01:00
Lukas Hass
ee92e19be6
Merge branch 'develop' into vite 2022-02-03 02:38:46 +01:00
Hanusiak Piotr
4b7278b843 add brackets to the condition 2022-02-02 16:42:38 +01:00
Hanusiak Piotr
a7b0516ac4 move with touch or right click 2022-02-02 16:38:43 +01:00
Hanusiak Piotr
87dde50251 some logs 2022-02-02 16:32:51 +01:00
Hanusiak Piotr
2c880c65b6 talk indicators wip 2022-02-02 15:47:38 +01:00
Hanusiak Piotr
288f8ebb61 merged develop 2022-02-02 14:32:57 +01:00
Hanusiak Piotr
45a7e9331b ran prettier 2022-02-02 13:30:49 +01:00
Hanusiak Piotr
0eaeaf7cfb Merge branch 'develop' into feature-options-menu 2022-02-02 09:31:10 +01:00
Alexis Faizeau
8bd0d648d4
Merge pull request #1811 from thecodingmachine/visual-cowebsite-icon
Enhance UX co-website opening
2022-02-01 18:52:46 +01:00
Alexis Faizeau
33e1a369de Add trigger message on cowebsite alt 2022-02-01 18:42:07 +01:00
David Négrier
45fe234d00
Merge pull request #1804 from thecodingmachine/fix-customize-woka-missing-buttons
removed unnecessary wake event unregistering
2022-02-01 18:15:19 +01:00
Alexis Faizeau
da381e6e16 Fix cowebsite lazy load by API 2022-02-01 17:25:53 +01:00
grégoire parant
bc03182129
Merge pull request #1807 from thecodingmachine/fix-safari-bug-joystick
fixed bugged safari's joystick
2022-02-01 16:42:45 +01:00
Hanusiak Piotr
43b821a4f2 fixed canvasBounds being wrongly calculated due to the resize / setZoom execution order 2022-02-01 15:49:23 +01:00
Alexis Faizeau
1124ed5a5e Implement cancelable woka resource 2022-02-01 15:17:04 +01:00
Hanusiak Piotr
27b7bb0dca removed unnecessary wake event unregistering 2022-02-01 12:55:29 +01:00
Hanusiak Piotr
520184fdeb add talk-icon 2022-02-01 12:25:14 +01:00
Lukas Hass
f87704b2ef
remove redundant font loading
see fd70d89061/README.md (custom)
2022-02-01 01:29:38 +01:00
Hanusiak Piotr
c3d04efe9b removed mock action from RemotePlayer 2022-01-31 13:01:47 +01:00
Hanusiak Piotr
989897cb01 added isActivatable() method to implement through interface 2022-01-31 13:00:14 +01:00
Hanusiak Piotr
2322f5f76d some improvements with registering menu actions 2022-01-31 12:26:37 +01:00
Hanusiak Piotr
5aba99403e merged develop 2022-01-31 10:00:39 +01:00
Gregoire Parant
dfd594ec17 Fix screen sharing spinner
Check if the peer connection is already connected status. In this case, the status store must be set to 'connected'.
In the case or player A send stream and player B send a stream, it's same peer connection, also the status must be changed to connect.

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-01-28 18:33:42 +01:00
Alexis Faizeau
34c077f470
Merge pull request #1789 from thecodingmachine/fix-errors
Fix i18n error message
2022-01-28 15:47:07 +01:00
grégoire parant
790c7175cf
Merge pull request #1785 from thecodingmachine/fix_camera_light
Remove hideMyCamera function, not working correctly
2022-01-28 15:25:56 +01:00
Alexis Faizeau
bea99711e4 Fix i18n error message 2022-01-28 15:11:57 +01:00
Gregoire Parant
fc8330a3ad Remove hideMyCamera function, not working correctly
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-01-28 12:01:58 +01:00
David Négrier
9a7140b027 Fixing users walking infinitely
Now, if no event is received from the Pusher after MAX_EXTRAPOLATION_TIME, the
moving variable of the user is set to false.

So if a client does not send an update on time (for instance if the user switched
tab while walking), on the screen of others, the woka will appear to stop.
2022-01-28 11:10:47 +01:00