Commit Graph

4090 Commits

Author SHA1 Message Date
_Bastler
a2e50dcd95 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-07 19:56:57 +01:00
Alexis Faizeau
31f3b2b48e
Merge pull request #1834 from thecodingmachine/stabilize-cowebsite
Remove priority on iframe add to cowebsites
2022-02-07 18:42:52 +01:00
Alexis Faizeau
7334d59c4f Remove priority on iframe add to cowebsites 2022-02-07 18:41:24 +01:00
David Négrier
3953b78cfe
Merge pull request #1823 from lukashass/fix-vscode-prettier
Remove explicit definition of prettier-plugin-svelte
2022-02-07 18:39:32 +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
e51300e850 Add cowebsite percentWidth property to the documention 2022-02-07 17:53:36 +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
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
David Négrier
cffafe9f15
Merge pull request #1827 from thecodingmachine/activatable-fixes
Activatable fixes
2022-02-07 14:39:40 +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
81272fbb3c yarn.lock update 2022-02-07 13:47:33 +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
_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
Lukas Hass
de5a505296
remove explicit definition of prettier-plugin-svelte
fixes prettier in vscode
2022-02-03 19:26:25 +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