Commit Graph

1318 Commits

Author SHA1 Message Date
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
Hanusiak Piotr
099d573296 cleanup 2022-01-27 16:50:25 +01:00
Alexis Faizeau
4f068c72be Co-website management move to Svelte 2022-01-27 16:34:58 +01:00
Alexis Faizeau
0bf1acfefb Improve game overlay UI 2022-01-27 16:34:58 +01:00
Hanusiak Piotr
8b8c24f6ef ActivatablesManager and little cleanup 2022-01-27 15:15:18 +01:00
Hanusiak Piotr
68c4a5f5ce different approach 2022-01-27 14:05:30 +01:00
Hanusiak Piotr
2781b72799 wip with handling outlines for activitable objects 2022-01-26 17:14:22 +01:00
Hanusiak Piotr
b88ebbdf08 update distance values on remotePlayer movement 2022-01-26 15:38:08 +01:00
Hanusiak Piotr
dbd06bda4e changing the way Outline is handled 2022-01-26 14:59:23 +01:00
Hanusiak Piotr
f42c7564b9 call activate() method on space key up 2022-01-26 13:16:52 +01:00
Hanusiak Piotr
3af6461c01 Activatable objects handling WIP 2022-01-26 12:57:10 +01:00
Hanusiak Piotr
5ae039b987 little cleanup 2022-01-26 10:54:51 +01:00
Hanusiak Piotr
06d403ebe3 simplify actionsMenu 2022-01-26 10:40:13 +01:00
Hanusiak Piotr
58227a39f8 destroy actionsMenu on RemotePlayer destroy() 2022-01-25 17:13:52 +01:00
Hanusiak Piotr
88f3032298 do not move player if clicked on Player or RemotePlayer. Close actionsMenu on second click 2022-01-25 15:47:21 +01:00
David Négrier
ef2f8b141f
Merge pull request #1743 from thecodingmachine/move-to-from-hash-parameter
Move to from hash parameter
2022-01-25 14:12:26 +01:00
Hanusiak Piotr
67627637aa added store with actions for actionsMenu 2022-01-25 13:42:41 +01:00
Hanusiak Piotr
69a2379e53 Merge branch 'develop' into feature-options-menu 2022-01-25 10:33:30 +01:00
Alexis Faizeau
2312d2e129
Merge pull request #1629 from thecodingmachine/translator
Translator: i18n
2022-01-25 09:48:48 +01:00
Alexis Faizeau
446b4639c7 Implement typesafe-i18n 2022-01-24 18:59:28 +01:00
Hanusiak Piotr
b5887bceb4 PR fixes 2022-01-24 17:03:14 +01:00
Alexis Faizeau
4829964127 Display correctly the username on Brave browser 2022-01-24 16:55:58 +01:00
Hanusiak Piotr
3cc38e6bbe Merge branch 'develop' into move-to-from-hash-parameter 2022-01-24 16:31:03 +01:00
Hanusiak Piotr
fd012d6c69 ActionsMenu WIP 2022-01-24 16:27:57 +01:00
David Négrier
d8327d1b72
Apply suggestions from code review
Fixing missing return attribute in doc
2022-01-22 22:20:41 +01:00
David Négrier
51c3f1d972 Refactoring translator to use "_" instead of "translator._".
This is shorter and pollutes less the code.
2022-01-21 17:09:29 +01:00
Nolway
bd01a35cc6 Add en-US translations 2022-01-21 17:09:29 +01:00
Nolway
41ef9fd49f Replace cookie by local storage to store language 2022-01-21 17:09:29 +01:00
Nolway
8286cdd41d Add WA.player.language in the API 2022-01-21 17:09:29 +01:00
Nolway
8a2767ef40 Implement Translator: i18n system 2022-01-21 17:09:29 +01:00
Hanusiak Piotr
e87c0a07a4 moveTo parameter working if layer is found 2022-01-20 15:10:54 +01:00
Hanusiak Piotr
bf6b9a7c83 do not call joystick logic if not on mobile 2022-01-20 09:39:41 +01:00
Hanusiak Piotr
62b00f852d throw an exception if no path found when using player.moveTo command. Cancelling path following no longer rejects the promise 2022-01-19 17:22:28 +01:00
Hanusiak Piotr
8f40e7a33c reject path following path promise if interrupted 2022-01-19 14:16:05 +01:00
Hanusiak Piotr
c023c4f8fd optional following path movement speed 2022-01-19 13:53:06 +01:00
Hanusiak Piotr
9b94705177 manually resolve promise on certain events for player path following 2022-01-19 13:09:17 +01:00
Hanusiak Piotr
f78392ceab Pathfinding manager will now return path steps in pixel units by default 2022-01-19 12:30:08 +01:00
Hanusiak Piotr
f96eac4737 Merge branch 'walking-shortest-path' into feature-move-character-api 2022-01-19 10:54:19 +01:00
Hanusiak Piotr
9e5d8f5d9c cr fixes 2022-01-19 10:37:56 +01:00
Hanusiak Piotr
29e44d3023 Player move API wip 2022-01-19 09:34:06 +01:00
Hanusiak Piotr
1c4e803dd7 move to the nearest tile if possible 2022-01-18 12:33:46 +01:00
Hanusiak Piotr
67cd0dfb29 disable context menu. Move player only on left-click 2022-01-18 11:18:52 +01:00
Hanusiak Piotr
391fe7eed3 for pathfinding we are now taking into consideration all tiles, looking for 'collides' property 2022-01-18 10:26:40 +01:00
Hanusiak Piotr
7576cea7e0 removed obsolete comments. Pass path as reference 2022-01-17 16:11:08 +01:00
Hanusiak Piotr
3e81278e72 proper player movement on click 2022-01-17 16:04:59 +01:00
Hanusiak Piotr
e557e8ea72 player following the path wip 2022-01-17 14:36:00 +01:00
Hanusiak Piotr
77ee39110f handle pointerup event 2022-01-17 11:52:02 +01:00
Hanusiak Piotr
28543be121 Player class is no longer dependent on UserInputManager 2022-01-17 11:37:28 +01:00
Hanusiak Piotr
173d10738d created interface to implement for UserInputManager 2022-01-17 11:16:42 +01:00
Hanusiak Piotr
000b2cfe73 created PathfindingManager. WIP 2022-01-14 12:49:18 +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
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
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
d99930a67e save last zoom value if setting the camera viewport without locking it 2022-01-13 16:17:49 +01:00