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
David Négrier
46e6917df6
Adding a playersStore
...
The playerStore can be useful to get the details of a given player from its ID.
2021-07-06 17:13:08 +02:00
David Négrier
cb78ff333b
Adding client side check of setVariable with writableBy property
2021-07-06 10:58:12 +02:00
David Négrier
0aa93543bc
Adding warning if "template" object is used as a variable
2021-07-05 18:48:26 +02:00
David Négrier
bf17ad4567
Switching setVariable to a query and fixing error hangling in query mechanism
2021-07-05 18:29:34 +02:00
David Négrier
c30de8c6db
Adding support for default variables values
2021-07-05 17:25:23 +02:00
David Négrier
62a4814961
Migrating WA.player.getCurrentUser and WA.room.getCurrentRoom to direct property access and WA.room.getMap
2021-07-05 11:53:33 +02:00
_Bastler
7932b7488f
update emotes
2021-07-03 11:15:18 +02:00
_Bastler
74823177f5
Merge branch 'develop' of github.com:thecodingmachine/workadventure into main
2021-07-02 20:59:39 +02:00
jonny
9bcdc9ba33
linter fixes
2021-07-02 19:05:03 +02:00
jonny
310e131a6e
eslint restart
2021-07-02 19:03:34 +02:00
jonny
369d453455
Merge remote-tracking branch 'remotes/upstream/develop' into trigger-message-refv3
2021-07-02 18:49:22 +02:00
David Négrier
ea1460abaf
Adding variables (on the front side for now)
2021-07-02 17:36:43 +02:00
David Négrier
280c59e6b5
Changing callback signature of registerAnswerer so that it can return a value and not necessarily a promise.
2021-07-02 17:26:28 +02:00
David Négrier
5b4a72ea1f
Add new "query/answer" utility functions for the scripting API
...
So far, the scripting API was using events to communicate between WA and the iFrame.
But often, the scripting API might actually want to "ask" WA a question and wait for an answer.
We dealt with this by using 2 unrelated events (in a mostly painful way).
This commit adds a "queryWorkadventure" utility function in the iFrame API that allows us
to send a query, and to wait for an answer. The query and answer events have a unique ID to be
sure the answer matches the correct query.
On the WA side, a new `IframeListener.registerAnswerer` method can be used to register a possible answer.
2021-07-02 16:49:22 +02:00
GRL
8644389d7e
remove unnecessary conversion type
2021-07-02 14:45:27 +02:00
GRL
c5b5326480
setProperty function doesn't set an empty array if property doesn't exist
2021-07-02 14:40:18 +02:00
GRL
e1611969ce
Merge branch 'develop' of github.com:thecodingmachine/workadventure into jonnytest1-tiles-start-positions
2021-07-02 14:35:28 +02:00
_Bastler
413f1ea6df
fix
2021-07-01 13:48:03 +02:00
_Bastler
2701d656da
Merge branch 'develop' of github.com:thecodingmachine/workadventure into main
2021-07-01 12:10:53 +02:00
GRL
01d02124d1
Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptAPIV2
2021-07-01 11:38:33 +02:00
_Bastler
ee1e4c1910
merge dev
2021-06-29 20:21:00 +02:00
David Négrier
8f3d9277ac
Merging master into develop
2021-06-29 18:39:43 +02:00
GRL
95bd639124
More statement
2021-06-29 16:50:33 +02:00
_Bastler
086243b92f
twemoji emote menu
2021-06-29 09:52:13 +02:00
David Négrier
1e57028e6e
Renaming changeTile to setTiles
2021-06-28 14:58:49 +02:00
GRL
ed84dacb9c
Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptAPIV2
2021-06-28 12:01:08 +02:00
GRL
b182a08ca2
correction from review
2021-06-28 09:33:13 +02:00
jonny
bbdf0a1289
fixed merge conflict
2021-06-25 18:20:16 +02:00
jonny
7f61e9addd
Merge remote-tracking branch 'remotes/upstream/develop' into tiles-start-positions
2021-06-25 18:14:40 +02:00
jonny
769e0fcc29
refactor to position object
2021-06-25 18:03:43 +02:00
jonny
c7fa5cab8b
cleanup
2021-06-25 17:57:09 +02:00
jonny
f536d538ea
added backwards compatible check and maps
2021-06-25 17:35:42 +02:00
_Bastler
c29ada18e9
formatting
2021-06-25 16:32:48 +02:00
_Bastler
07b6fce877
re-adding popup-input, video container fix
2021-06-25 11:34:27 +02:00
_Bastler
0bb39a6a5d
Merge branch 'develop' of github.com:thecodingmachine/workadventure into main
2021-06-24 18:28:04 +02:00
David Négrier
ac97cf5772
Fixing a lock when the player is moving from one room to the other
...
This was due to a store not properly unsubscribed when changing rooms.
2021-06-24 17:02:57 +02:00
_Bastler
3cb877cee0
Merge branch 'develop' of github.com:thecodingmachine/workadventure into main
2021-06-24 15:42:47 +02:00
David Négrier
8c8649b584
Merge pull request #1232 from thecodingmachine/fixCollides
...
Fix collides
2021-06-24 15:19:10 +02:00
_Bastler
f4d2897957
Merge branch 'develop' of github.com:thecodingmachine/workadventure into main
2021-06-24 13:02:41 +02:00
kharhamel
a094e16c1f
FIX: solved a menu crash
2021-06-24 12:14:28 +02:00
GRL
dcc7f2a686
Fix collides
2021-06-24 12:10:44 +02:00
GRL
c79603d7fa
Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptAPIV2
2021-06-24 11:55:07 +02:00
David Négrier
2f282e3469
peerStore loading order caused issues. Fixed in GameScene (+ extracted a few stores in their files)
2021-06-24 11:54:09 +02:00
GRL
4903911d62
Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptAPIV2
2021-06-24 11:33:29 +02:00
GRL
a666bf310b
Change Tiles
2021-06-24 11:31:29 +02:00
David Négrier
e4708149e0
Merge branch 'develop' of github.com:thecodingmachine/workadventure into svelte_video_overlay
...
# Conflicts:
# front/package.json
# front/src/Components/App.svelte
# front/src/Phaser/Game/GameScene.ts
# front/src/Phaser/Menu/MenuScene.ts
# front/src/WebRtc/MediaManager.ts
2021-06-24 10:49:55 +02:00
_Bastler
ab20a074fe
Merge branch 'develop' of github.com:thecodingmachine/workadventure into main
2021-06-24 09:47:16 +02:00
_Bastler
418dd4a6c5
merge dev
2021-06-24 08:56:29 +02:00
jonny
5472d220ba
added trigger message code
2021-06-23 17:32:32 +02:00
jonny
64847cd465
adjusted null if no hash
2021-06-23 12:42:24 +02:00
jonny
b20b4abb9e
allow start hashes in tiles
...
# Conflicts:
# front/src/Phaser/Game/GameScene.ts
2021-06-23 12:37:50 +02:00
GRL
24cc340cb9
Merge branch 'metadataScriptingApi' of github.com:thecodingmachine/workadventure into metadataScriptAPIV2
2021-06-23 12:02:29 +02:00
GRL
2a2cea2cd5
Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi
2021-06-23 11:40:08 +02:00
GRL
bdb32a29e1
New methods refactored
2021-06-23 11:32:11 +02:00
David Négrier
b7934d9d03
Merge branch 'develop' of github.com:thecodingmachine/workadventure into functional-tile-properties
2021-06-23 10:40:59 +02:00
GRL
b50df10a49
Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi
2021-06-23 09:25:13 +02:00
GRL
85fe92f604
Merge branch 'menu-commands-apiref' of github.com:jonnytest1/workadventure into metadataScriptingApi
2021-06-23 09:18:20 +02:00
David Négrier
ee07f637fa
Merge pull request #1219 from thecodingmachine/rex_outline
...
Putting an outline on the character name
2021-06-22 18:14:27 +02:00
David Négrier
1ef1a1cb22
Removing useless import
2021-06-22 17:47:54 +02:00
David Négrier
f1d00aac0e
Merge pull request #1211 from thecodingmachine/adminSvelte
...
Migrating ConsoleGlobalMessageManager in svelte
2021-06-22 17:28:37 +02:00
David Négrier
dc0f3feabf
Putting an outline on the character name
...
In the future, we might want to put an outline on the whole character body but this is harder as the body is actually a container and so we would need to turn this container into a sprite first.
2021-06-22 17:15:18 +02:00
David Négrier
e9dd7ebdd9
Enabling Outline back on actionable objects
...
Actionable objects (still a prototype) were outlined when you walk next to them.
The OutlinePipeline was broken when moving in Phaser 3.50+.
This PR completely removes the custom OutlinePipeline and replaces it with the rexOutlinePipelinePlugin
that is provided by a third party library and that works great \o/
2021-06-22 16:35:57 +02:00
GRL
cec7087fc2
Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi
2021-06-22 16:28:45 +02:00
GRL
67d4c6e271
Resolve review
2021-06-22 16:12:53 +02:00
GRL
0728d462a5
Merge branch 'develop' of github.com:thecodingmachine/workadventure into adminSvelte
2021-06-22 16:08:06 +02:00
David Négrier
eb526f5b67
Upgrading animatedtiles plugin to trigger an event when an animation occurs and setting the scene to dirty state
2021-06-22 14:21:15 +02:00
GRL
ca3f5c599a
Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi
2021-06-22 14:00:19 +02:00
GRL
0cc7ed1647
Merge branch 'develop' of github.com:thecodingmachine/workadventure into adminSvelte
2021-06-22 10:36:16 +02:00
jonny
64a00481f0
fixed wrong import
2021-06-21 18:39:02 +02:00
jonny
ba1bcf226a
menu command api
2021-06-21 18:22:31 +02:00
David Négrier
e4dab5fd0d
Merge branch 'develop' of github.com:thecodingmachine/workadventure into feature/animated-tiles
...
# Conflicts:
# front/package.json
# front/tsconfig.json
# front/yarn.lock
2021-06-21 17:26:00 +02:00
GRL
232fd33ec8
Migrating ConsoleGlobalMessageManager in svelte
2021-06-21 17:19:27 +02:00
David Négrier
77a4d23301
Renaming biggestAvailableArray to biggestAvailableArea + removing duplicated code.
2021-06-21 14:07:03 +02:00
jonny
5bf943ce77
converted cache to constant lookup time
2021-06-20 19:14:04 +02:00
jonny
92485a02cf
tileIndex setting got merged out
2021-06-19 15:46:32 +02:00
jonny
c1d9b2c9ed
coverted property map to object
2021-06-19 15:41:58 +02:00
jonny
27ccdf165c
fixed merge imports
2021-06-19 15:24:27 +02:00
jonny
74dda8ab69
allow properties on tiles
...
# Conflicts:
# front/src/Phaser/Game/GameMap.ts
# front/src/Phaser/Map/ITiledMap.ts
2021-06-19 15:23:30 +02:00
David Négrier
227575043b
Removing dead code
2021-06-17 18:56:30 +02:00
David Négrier
d6ec0d22d3
Code cleanup
2021-06-17 10:35:08 +02:00
David Négrier
d533894a74
Fixing warnings and moving biggest area compute in store
2021-06-17 10:13:23 +02:00
David Négrier
3b278d0498
Removing dead code
2021-06-17 10:07:27 +02:00
David Négrier
76261de805
Enabling back the open report feature
2021-06-17 10:07:27 +02:00
David Négrier
5cf5e0ce2b
Changing the way we focus a video element.
...
Now, only one video element can be important.
2021-06-17 10:07:27 +02:00
David Négrier
e7b0f859a5
Migrating the video overlay in Svelte (WIP)
2021-06-17 10:07:27 +02:00
_Bastler
b96ba7f8c5
Merge branch 'develop' of github.com:thecodingmachine/workadventure into main
2021-06-16 19:58:34 +02:00
David Négrier
e6264948b1
Merge pull request #946 from jonnytest1/load-page-api
...
Load page iframe-api
2021-06-16 18:10:10 +02:00
_Bastler
a3bed1eeb4
Merge branch 'develop' of github.com:thecodingmachine/workadventure into main
2021-06-16 11:38:43 +02:00
David Négrier
0afdbf7040
Fixing Svelte-check errors
2021-06-15 18:34:11 +02:00
kharhamel
c559b2104b
scene cleanup
2021-06-15 15:32:40 +02:00
_Bastler
b3c58bd5d4
Merge branch 'develop' of github.com:thecodingmachine/workadventure into main
2021-06-15 15:24:00 +02:00
jonny
7712bd685b
fixed merge errors
2021-06-15 15:19:45 +02:00
jonny
238f333b81
Merge remote-tracking branch 'remotes/workadventure-main/develop' into load-page-api
...
# Conflicts:
# front/src/Api/Events/IframeEvent.ts
# front/src/Api/IframeListener.ts
# front/src/Phaser/Game/GameScene.ts
# front/src/iframe_api.ts
2021-06-15 15:05:49 +02:00
GRL
09da69c24a
CustomizeScene buttons use moveHorizontally and moveVertically
2021-06-15 11:16:44 +02:00
_Bastler
29da03ee44
Merge branch 'develop' of github.com:thecodingmachine/workadventure into main
2021-06-15 09:21:40 +02:00
GRL
b04016f30f
Merge branch 'develop' of github.com:thecodingmachine/workadventure into gameSizeFix
2021-06-15 09:06:47 +02:00
_Bastler
39dbd56207
Merge branch 'develop' of github.com:thecodingmachine/workadventure into main
2021-06-15 08:18:39 +02:00
David Négrier
6bca3469b6
Removing useless import
2021-06-14 18:44:20 +02:00
David Négrier
1fa03e44df
Fixing size of camera on resize
...
The size of the Camera after a change in zoom is only computed on the "render" step.
Therefore, we should wait the "render" step to call GameScene.onResize.
Closes #1180
2021-06-14 18:40:58 +02:00
David Négrier
f16514db21
Merge pull request #1177 from thecodingmachine/bugfix/1167
...
Making code more robust regarding scene being null in Character class
2021-06-14 16:54:12 +02:00
David Négrier
dcd44f283f
Making code more robust regarding scene being null in Character class
...
Not sure how this can happen but it does.
Closes #1167
2021-06-14 16:40:33 +02:00
