Commit graph

1386 commits

Author SHA1 Message Date
David Négrier 8f3d9277ac Merging master into develop 2021-06-29 18:39:43 +02:00
GRL b457ce493b Suppress console.log 2021-06-29 09:44:57 +02:00
GRL dad8cdef8b Merge branch 'develop' of github.com:thecodingmachine/workadventure into OpenWebSiteScriptAllowAPI 2021-06-29 09:42:20 +02:00
Valdo Romao 723001e1e7 Added better favicon 2021-06-29 00:12:00 +01:00
GRL 389ca25b6a Cowebsite opened by script can use Iframe Api 2021-06-28 18:00:48 +02:00
Valdo Romao 4cf5a6f7a0 Merge branch 'develop' of https://github.com/thecodingmachine/workadventure into new-favicon 2021-06-28 15:56:28 +01:00
David Négrier 3fd4f9d384 Adding a warning message if an unauthorized iFrame tries to communicate with WA
Closes #1241
2021-06-28 15:20:27 +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
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
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
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
David Négrier 0828dd8af3 Making max line length to 120 2021-06-23 16:58:57 +02:00
David Négrier 3f0ef2d31a Fixing prettier run command 2021-06-23 16:56:33 +02:00
David Négrier f6d3783f6c Removing git add from lint-staged since it is not necessary since v10 2021-06-23 16:50:00 +02:00
David Négrier ecbadda65a
Merge pull request #1224 from thecodingmachine/prettier
Setting up prettier
2021-06-23 16:34:21 +02:00
David Négrier 9f9cf5a3bb Fixing .gitignore files 2021-06-23 16:30:42 +02:00
David Négrier 4cac260f81 Adding prettier on back and pusher (not running them right now) 2021-06-23 16:23:16 +02:00
David Négrier c0bfec7b11 Adding Prettier configuration 2021-06-23 15:51:31 +02:00
GRL 95d8cf9257 Change requested 2021-06-23 14:54:06 +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
David Négrier bdc4b43c17 Setting up prettier
In order not to wreak havoc on all the open PRs, Prettier will be added slowly,
on every changed file, thanks to Husky (for a precommit hook) and lint-staged, for linting only staged files.
2021-06-23 10:10:53 +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
David Négrier 1283e86ce8 Adding test map for animated tiles 2021-06-22 10:22:48 +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