David Négrier
319db95bc8
Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptAPIV2
...
# Conflicts:
# front/src/Api/iframe/room.ts
2021-06-28 14:50:26 +02:00
David Négrier
0c5774a48f
Merge pull request #1229 from jonnytest1/cache-fix
...
immutableData was never assigned
2021-06-28 14:18:45 +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
b0eb241fc3
oO something kept movin the comment to the next line
2021-06-25 18:45:15 +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
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
David Négrier
8c8649b584
Merge pull request #1232 from thecodingmachine/fixCollides
...
Fix collides
2021-06-24 15:19:10 +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
David Négrier
8d59680de5
Removing useless code
2021-06-24 10:36:47 +02:00
David Négrier
5ed61012f0
Created a PeerStatus type instead of "connecting" | "connected" | "error" | "closed"
2021-06-24 10:34:36 +02:00
jonny
d1178b1a01
immutableData was never assigned
2021-06-23 20:19:38 +02:00
jonny
54d392be82
fixed not returnin null if parsed from url
2021-06-23 15:06:38 +02:00
GRL
95d8cf9257
Change requested
2021-06-23 14:54:06 +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
GRL
be23db5bcf
Resolve import and LoadPageEvent issue
2021-06-22 16:07:31 +02:00
David Négrier
bdbd19c3da
Merge pull request #1216 from thecodingmachine/feature/animated-tiles
...
Add animated Tiles plugin
2021-06-22 15:32:55 +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
55d99b24f4
Correction form review and checks
2021-06-22 10:43:20 +02:00
GRL
0cc7ed1647
Merge branch 'develop' of github.com:thecodingmachine/workadventure into adminSvelte
2021-06-22 10:36:16 +02:00
GRL
4fedc30301
Correction form review and checks
2021-06-22 10:27:54 +02:00
GRL
da5ae02a06
Correction form review and checks
2021-06-22 10:22:49 +02:00
GRL
8a1c57c434
Correction form review and checks
2021-06-22 10:10:03 +02:00
GRL
267a0bbe4d
Correction form review and checks
2021-06-22 09:49:04 +02:00
GRL
5cac4f52bc
Correction form review and checks
2021-06-22 09:43:41 +02:00
jonny
8be29062f6
reverted import sorting
2021-06-21 18:41:41 +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
kharhamel
42c0d1002f
FIX: no more whitespaces in player names
2021-06-21 17:58:04 +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
b59cbcac4c
Merge branch 'develop' of github.com:thecodingmachine/workadventure into svelte_video_overlay
...
# Conflicts:
# front/package.json
2021-06-21 14:54:32 +02:00
David Négrier
cddade059f
Removing commented code
2021-06-21 14:49:41 +02:00
David Négrier
a08f6a33ac
Improving naming
2021-06-21 14:43:10 +02:00
David Négrier
77a4d23301
Renaming biggestAvailableArray to biggestAvailableArea + removing duplicated code.
2021-06-21 14:07:03 +02:00
David Négrier
6101548d89
Fixing bug where only one chat listener can be added.
2021-06-21 13:47:07 +02:00
David Négrier
620bd1ab2c
Splitting classes in separated files
2021-06-21 12:26:12 +02:00
David Négrier
9129ceede1
Improving refactoring of API following @jonnytest1 feedback
2021-06-21 11:48:39 +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
34dc5a0bc6
Refactoring WorkAdventureAPI.
...
Simplifying a lot what was done (even if the new code is a bit less automated, it allows to list exactly the methods we want to see deprecated and to add a notification message)
2021-06-18 17:22:56 +02:00
David Négrier
227575043b
Removing dead code
2021-06-17 18:56:30 +02:00
David Négrier
4ec92ddf58
Adding new icons for the change layout button
2021-06-17 18:30:08 +02:00
jonny
702f4fe4c0
converted goToRoom to typed call
2021-06-17 11:32:59 +02:00
jonny
318749e5a8
develop merge
2021-06-17 11:30:16 +02:00
David Négrier
f6554a1082
Merge branch 'develop' of github.com:thecodingmachine/workadventure into iframe-api-refactor
...
# Conflicts:
# front/src/iframe_api.ts
2021-06-17 11:23:56 +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
d888b694cc
Adding button to change layout
2021-06-17 10:07:27 +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
ac7fa164b6
Adding importance handling
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
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
jonny
c1e202b7b1
renamed to goToRoom
2021-06-16 17:16:00 +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
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
David Négrier
eb895ceb58
Merge pull request #1178 from thecodingmachine/touchIframeResize
...
FIX: cowebsite resize now works on touchscreens
2021-06-15 11:42:41 +02:00
GRL
09da69c24a
CustomizeScene buttons use moveHorizontally and moveVertically
2021-06-15 11:16:44 +02:00
kharhamel
a5779095f8
FIX: cowebsite resize now works on touchscreens
2021-06-15 10:55:18 +02:00
GRL
b04016f30f
Merge branch 'develop' of github.com:thecodingmachine/workadventure into gameSizeFix
2021-06-15 09:06:47 +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
6af9b5d0fc
Disable screensharing button if user refuses rights
...
If the user refuses the popup to screen-share, we should switch back the button to gray.
Closes #1179
2021-06-14 18:18:57 +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
David Négrier
e3ee66527a
Fixing bug slowing down the CustomizeScene a lot
...
By forcing the containers to be updated only in the "update" method, we seem to be solving some bugs regarding the way sprites are handled.
There is still an issue though. Some times, for some reasons, the update list seems to be growing a lot.
The more we click the left/right arrow to choose a character, the slower it gets (but with this commit, it does not lock anymore)
2021-06-14 16:32:09 +02:00
GRL
b239edb266
Clean code
2021-06-14 16:09:41 +02:00
