Commit graph

1189 commits

Author SHA1 Message Date
Ludwig Behm 146e8e0dff Merge branch 'develop' of https://github.com/thecodingmachine/workadventure into develop 2022-02-16 00:19:55 +01:00
Lukas Hass cdc3d182bc
fix comparison that is always false 2022-02-15 12:00:32 +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
Ludwig Behm 9e30039551 Merge branch 'develop' of https://github.com/thecodingmachine/workadventure into develop 2022-02-12 00:16:44 +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
Alexis Faizeau 460d67534a Move all game scene game map properties listeners 2022-02-10 17:02:10 +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 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
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
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
Ludwig Behm 8e77e85749 front: revert animated loading screen logo 2022-02-07 17:51:25 +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
Ludwig Behm f910c833dd front: added animated Loader logo 2022-02-04 04:26:11 +01:00
Ludwig Behm 0cd0f5acc0
Merge branch 'develop' of https://github.com/thecodingmachine/workadventure into develop 2022-02-04 00:41:26 +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
tabascoeye ddbda8f267 Remove all weapons from the character select 2022-02-03 02:10:53 +01:00
¯\_(ツ)_/¯ e368067462 Characters, clothes and accessories from rc3 2022-02-03 02:02:45 +01:00
tabascoeye ebd4bae452 Add companions from rC3
Thanks to TabascoEye, MikeTango, deinkoks and possibly others. :-)
2022-02-03 02:02:23 +01:00
PizZaKatZe 185d3b58ed Pusher federation
Source: https://gist.github.com/jstsmthrgk/2c82124c9ac2bd453658f52c90b8dd44
2022-02-02 22:48:19 +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 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