Commit Graph

1005 Commits

Author SHA1 Message Date
_Bastler b2d1ace0ea Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-28 13:25:26 +02:00
Gregoire Parant 4b4356e7ff Merge branch 'master' into develop 2021-07-28 12:37:14 +02:00
_Bastler 3c52bb3dd4 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-28 08:25:52 +02:00
Stefan Weil 64065b2798 Fix some typos (found by codespell) (#1316)
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2021-07-27 14:29:09 +02:00
grégoire parant fc9865e273 HotFix position WOKA (#1317)
- Fix the moving position when a user enters in "custom your own" with custom WOKA loaded from admin
2021-07-27 14:28:00 +02:00
David Négrier cdd61bdb2c Merging with develop 2021-07-23 16:41:38 +02:00
David Négrier 3d5c222957 Reverting changes regarding single quotes 2021-07-23 14:59:56 +02:00
GRL ba6e6235d6 Merge branch 'develop' of github.com:thecodingmachine/workadventure into GlobalMessageToWorld 2021-07-23 14:10:43 +02:00
_Bastler 07b3dc0f5e Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-23 12:18:30 +02:00
David Négrier 2aba6b1c27 Fixing loop when setting variables
Setting a variable would makes the application enter in an infinite loop of events (between all the scripts and the back)
This fix makes sure a variable does not emit any event if it is changed to a value it already has.
2021-07-23 11:51:01 +02:00
GRL 68ff1b9e17 Merge branch 'develop' of github.com:thecodingmachine/workadventure into GlobalMessageToWorld 2021-07-22 16:26:01 +02:00
GRL 9e16bfc366 playGlobalMessage are receive as adminRoomMessage
Suppression of GlobalMessageManager and TypeMessage
Migrating message to svelte
2021-07-22 16:14:27 +02:00
_Bastler b3b99d1a55 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-22 14:53:32 +02:00
David Négrier 31811ab906 Improve docblock 2021-07-22 11:24:30 +02:00
_Bastler 39561b315c Twemoji Picker 2021-07-21 18:54:43 +02:00
David Négrier f435cecfdc Merge branch 'develop' of github.com:thecodingmachine/workadventure into scripting_api_room_metadata 2021-07-21 15:37:53 +02:00
_Bastler c9b3835f99 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-20 20:31:01 +02:00
grégoire parant b336e3b08a Delete logo TCM on Error scene (#1297) 2021-07-20 16:45:24 +02:00
_Bastler a503866311 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-19 18:56:01 +02:00
GRL78 697f316780 In SelectCharacterScene, if custom character not loaded then select the first character (#1284) 2021-07-19 17:06:36 +02:00
GRL78 9432c82386 Change address mail to contact us (#1282) 2021-07-19 17:05:23 +02:00
David Négrier dbd5b80636 Adding support for "readableBy" and "writableBy" in back
This means that we are now loading maps from server side.
2021-07-19 10:16:43 +02:00
GRL 0d3c697add Merge branch 'develop' of github.com:thecodingmachine/workadventure into GlobalMessageToWorld 2021-07-19 10:01:13 +02:00
_Bastler 1054f6e0fa Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-16 18:11:06 +02:00
Kharhamel d8176c2f8d Merge pull request #1291 from thecodingmachine/chatTweak
FEATURE: chat tweak
2021-07-16 15:49:36 +02:00
kharhamel f840034d9c FEATURE: chat tweak 2021-07-16 14:25:59 +02:00
David Négrier 5c7ea7b258 Merge branch 'develop' of github.com:thecodingmachine/workadventure into scripting_api_room_metadata 2021-07-16 11:22:36 +02:00
_Bastler bcfdcafa81 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-16 11:11:06 +02:00
David Négrier c9fa9b9a92 Migrating away from the notion of public/private URL in WorkAdventure Github repository
The notion of public/private repositories (with /_/ and /@/ URLs) is specific to the SAAS version of WorkAdventure.
It would be better to avoid leaking the organization/world/room structure of the private SAAS URLs inside the WorkAdventure Github project.

Rather than sending http://admin_host/api/map?organizationSlug=...&worldSlug=...&roomSlug=...., we are now sending /api/map&playUri=...
where playUri is the full URL of the current game.
This allows the backend to act as a complete router.
The front (and the pusher) will be able to completely ignore the specifics of URL building (with /@/ and /_/ URLs, etc...)
Those details will live only in the admin server, which is way cleaner (and way more powerful).
2021-07-15 17:07:47 +02:00
GRL e43ea3aa5e Graphic upgrade of the global message console
Fix: error if LoginScene doesn't exist
2021-07-15 15:09:35 +02:00
_Bastler b9e8c970f2 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-14 19:36:16 +02:00
kharhamel 3983d0c5bc FEATURE: improved the notification system 2021-07-13 16:54:11 +02:00
_Bastler 304c3e8906 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-13 16:48:34 +02:00
Kharhamel 41a1f56bd5 Merge pull request #1111 from thecodingmachine/svelteChat
FEATURE: migrated the chat window to svelte
2021-07-13 11:25:38 +02:00
GRL f7127bfb5a Graphic upgrade 2 2021-07-13 11:05:34 +02:00
_Bastler bcab6ae1f1 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-08 08:20:42 +02:00
kharhamel 3cfbcc6b02 FEATURE: migrated the chat window to svelte 2021-07-07 18:07:58 +02:00
David Négrier e65e8b2097 First version with variables that actually work 2021-07-07 17:17:28 +02:00
David Négrier ae9af56661 Merge pull request #1264 from thecodingmachine/UpdateShowHideLayer
Show/Hide Layer now unset collision and can show/hide all the layer in a group layer
2021-07-07 17:15:41 +02:00
GRL 64c569c42f Add documentation and CHANGELOG
Modify error message
2021-07-07 17:06:23 +02:00
GRL 41c60579a6 Merge branch 'develop' of github.com:thecodingmachine/workadventure into UpdateSetTiles 2021-07-07 17:00:10 +02:00
GRL e50292a2ba Add documentation
No second parameter
2021-07-07 16:58:54 +02:00
GRL 6f6ad949ca Merge branch 'develop' of github.com:thecodingmachine/workadventure into UpdateShowHideLayer 2021-07-07 16:34:36 +02:00
GRL 24811e0a31 SetProperty delete a property where tha value is undefined and load the map of exitUrl property 2021-07-07 14:59:40 +02:00
GRL bef5e139c0 SetTiles can now set a tile to null so that there is no more tile. 2021-07-07 14:42:17 +02:00
GRL d51ac45079 Show/Hide Layer now unset collision and can show/hide all the layer in a group layer 2021-07-07 14:26:53 +02:00
_Bastler 303aef3e68 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-07 12:20:28 +02:00
David Négrier 5116b82e77 Merge branch 'develop' of github.com:thecodingmachine/workadventure into scripting_api_room_metadata 2021-07-07 11:55:00 +02:00
David Négrier 34cb0ebf39 Users blocking now rely on UUID rather than ID
This way, if a user A blocks another user B, if user B refreshes the browser or leaves and re-enters the room, user B will still be blocked.
As a side effect, this allows us to completely remove the "sockets" property in the SocketManager on the Pusher.
2021-07-07 11:24:51 +02:00
David Négrier 19bd1045e1 Merge branch 'develop' of github.com:thecodingmachine/workadventure into scripting_api_room_metadata 2021-07-06 17:24:16 +02:00