GRL
dad8cdef8b
Merge branch 'develop' of github.com:thecodingmachine/workadventure into OpenWebSiteScriptAllowAPI
2021-06-29 09:42:20 +02:00
David Négrier
ec75509725
Merge pull request #839 from ValdoTR/new-favicon
...
Updated favicons
2021-06-29 09:03:15 +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
49d627ca38
Merge pull request #1244 from thecodingmachine/warning_message_on_iframe_api
...
Adding a warning message if an unauthorized iFrame tries to communicate with WA
2021-06-28 15:24:55 +02: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
46ae4fda74
Merge pull request #1242 from thecodingmachine/iframe_load_url
...
Trying to find iframe_api.js URL script dynamically
2021-06-28 14:10:32 +02:00
David Négrier
303d2a7837
Adding a warning regarding the "controlled" XSS in iframe.html
2021-06-28 13:55:17 +02:00
David Négrier
7f79c2dc4a
Making the test page URL dynamic depending on the environment
2021-06-28 13:54:49 +02:00
David Négrier
330a795fee
Trying to find iframe_api.js URL script dynamically
...
This would allow us to have tests that don't rely on the iframe_api.js from prod, and would allow scripts that target the correct iframe API, no matter if they are running on workadventu.re or on self-hosted maps.
2021-06-28 11:51:13 +02:00
David Négrier
63d4c99d15
Merge pull request #1235 from thecodingmachine/fix_map_change
...
Fixing a lock when the player is moving from one room to the other
2021-06-24 17:08:06 +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
66bceb577a
Merge pull request #1233 from thecodingmachine/fixMenuCrash
...
FIX: solved a menu crash
2021-06-24 13:51:58 +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
6ed8ce9af1
Merge pull request #1163 from thecodingmachine/svelte_video_overlay
...
Migrating the video overlay in Svelte
2021-06-24 10:53:35 +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
David Négrier
52a90e52d4
Merge pull request #1226 from thecodingmachine/apply_prettier_on_push_and_back
...
Applying prettier in CI for pusher and back containers
2021-06-24 10:29:21 +02:00
David Négrier
3e464580ea
Fixing eslint ignore broken by Prettier
2021-06-24 10:23:32 +02:00
David Négrier
10c3d6dee2
Applying Prettier on pusher and back
2021-06-24 10:09:10 +02:00
jonny
d1178b1a01
immutableData was never assigned
2021-06-23 20:19:38 +02:00
David Négrier
06b7f5ba2f
Applying prettier in CI for pusher and back containers
2021-06-23 17:13:16 +02:00
David Négrier
3cf0a9ee84
Merge pull request #1225 from thecodingmachine/apply_prettier_on_pusher_and_back
...
Setting up prettier on pusher and back
2021-06-23 17:12:16 +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
3eab074e2a
Setting up lint-staged on front and back
2021-06-23 16:45:38 +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
f4209515a1
Merge pull request #1080 from thecodingmachine/metadataScriptingApi
...
Customize metadata with scripting api
2021-06-23 15:57:14 +02:00
David Négrier
d2be9fa931
Adding contributing guide explaining how to setup the precommit hook
2021-06-23 15:54:13 +02:00
David Négrier
c0bfec7b11
Adding Prettier configuration
2021-06-23 15:51:31 +02:00
David Négrier
a5f0cadccd
Create codeql-analysis.yml
2021-06-23 15:29:02 +02:00
David Négrier
6237672855
Create SECURITY.md
2021-06-23 15:26:17 +02:00
GRL
95d8cf9257
Change requested
2021-06-23 14:54:06 +02:00
GRL
12da5e64f8
Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi
2021-06-23 14:43:23 +02:00
David Négrier
a3eb715414
Improving wa-maps doc layout
2021-06-23 14:41:35 +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
633fa9f870
Merge pull request #1210 from jonnytest1/functional-tile-properties
...
tile propeties can be used for effects
2021-06-23 11:18:02 +02:00
David Négrier
af67d9b513
Migrating WA-Maps page to this repo and documenting the fact that tiles properties can now be used.
2021-06-23 10:44:55 +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
