Commit Graph

4066 Commits

Author SHA1 Message Date
_Bastler
104f792444 remove warning 2022-02-04 15:05:58 +01:00
_Bastler
9054174c40 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-04 15:04:36 +01:00
Alexis Faizeau
862c502bea
Merge pull request #1824 from thecodingmachine/fix-focus-iframe
Fix game unfocusable after clicking on iframe
2022-02-04 14:59:15 +01:00
Alexis Faizeau
6863fa3764 Fix game unfocusable after clicking on iframe 2022-02-04 14:46:57 +01:00
_Bastler
86ac7372a7 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-03 19:20:53 +01:00
Alexis Faizeau
2232f7caf4
Merge pull request #1819 from thecodingmachine/fix-cowebsite
Fix display of co-website thumbnail
2022-02-03 18:20:50 +01:00
Alexis Faizeau
137bd831a9 Fix main cowebsite switcher 2022-02-03 15:20:30 +01:00
Alexis Faizeau
b91de4a91d Replace favicon by meet icon on jitsi cowebsite thumbnail 2022-02-03 15:03:42 +01:00
Alexis Faizeau
1b93bf666f Remove translate from warning message 2022-02-03 14:38:53 +01:00
_Bastler
f21f51c006 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-03 12:39:32 +01:00
David Négrier
c34ee73448
Merge pull request #1813 from thecodingmachine/fix-cowebsite
Fix mozaic layout
2022-02-03 11:44:23 +01:00
Alexis Faizeau
7e9343f1b7 Fix mozaic layout 2022-02-03 11:17:11 +01:00
Alexis Faizeau
4a9cc57d60 Cancelable companion resource 2022-02-03 11:17:11 +01:00
_Bastler
b0faec0459 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-03 11:08:03 +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
David Négrier
be2727f5c4
Merge pull request #1817 from thecodingmachine/fix-interaction
fixed actions-menu not appearing
2022-02-03 10:13:36 +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
_Bastler
9a17af1a74 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-02 19:18:03 +01:00
David Négrier
f1c999ffc1
Merge pull request #1815 from thecodingmachine/right-click-movement
move with touch or right click
2022-02-02 18:34:36 +01:00
Hanusiak Piotr
4b7278b843 add brackets to the condition 2022-02-02 16:42:38 +01:00
_Bastler
301eaba90e Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-02 16:42:18 +01:00
Hanusiak Piotr
a7b0516ac4 move with touch or right click 2022-02-02 16:38:43 +01:00
David Négrier
272b43106b
Merge pull request #1775 from thecodingmachine/feature-options-menu
Feature options menu
2022-02-02 14:10:38 +01:00
Hanusiak Piotr
45a7e9331b ran prettier 2022-02-02 13:30:49 +01:00
_Bastler
90c0e2dd97 update readme 2022-02-02 11:09:45 +01:00
_Bastler
f7b92f843e merge dev 2022-02-02 10:21:24 +01:00
_Bastler
ffe0f53907 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-02-02 10:21:13 +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
331068c965
Merge pull request #1809 from thecodingmachine/fix-errors
Fix cowebsite lazy load by API
2022-02-01 17:56:48 +01:00
Alexis Faizeau
7e966a7381 Animate cowebsite icons 2022-02-01 17:52:10 +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
_Bastler
468adf4f64 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-02-01 16:07:09 +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
5337f0dda2
Merge pull request #1803 from thecodingmachine/fix-errors
Implement cancelable woka resource
2022-02-01 15:26:08 +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
_Bastler
0e84293720 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-02-01 07:58:11 +01:00
Alexis Faizeau
315e2f6417
Merge pull request #1800 from thecodingmachine/fix-my-cam
Define max height on streamable
2022-01-31 14:29:42 +01:00
Nolway
541aa78a1f Define max height on streamable 2022-01-31 14:29:01 +01:00
_Bastler
6cea6a3ce0 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-31 13:57:46 +01:00
Hanusiak Piotr
a448015196 removed non existing test from WA test cases 2022-01-31 13:04:28 +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
Alexis Faizeau
4210334aa2
Merge pull request #1798 from thecodingmachine/fix-my-cam
Fix bugs on new camera display
2022-01-31 12:57:03 +01:00
Hanusiak Piotr
2322f5f76d some improvements with registering menu actions 2022-01-31 12:26:37 +01:00