72a07467c5
Merge branch 'develop' of github.com:thecodingmachine/workadventure into main
2021-07-01 12:10:26 +02:00
164f88ef4c
Merge pull request #1250 from thecodingmachine/fix_push_to_npm
...
Fixing NPM package generation
2021-06-30 10:21:04 +02:00
bfcdd31ed2
Fixing NPM package generation
...
The generation was broken due to the refactoring in several classes (some of them where not properly exported).
Also, trying to generate the NPM package on every build now (to detect issues).
2021-06-30 10:15:55 +02:00
ee1e4c1910
merge dev
2021-06-29 20:21:00 +02:00
cb2485bab0
Merge pull request #1248 from thecodingmachine/master_backport
...
Backporting master into develop
2021-06-29 18:50:54 +02:00
8f3d9277ac
Merging master into develop
2021-06-29 18:39:43 +02:00
33ee190b0f
Merge pull request #1246 from thecodingmachine/OpenWebSiteScriptAllowAPI
...
Cowebsite opened by script can use Iframe Api
2021-06-29 18:27:54 +02:00
3c77ce945d
Improving docs
2021-06-29 18:26:21 +02:00
086243b92f
twemoji emote menu
2021-06-29 09:52:13 +02:00
b457ce493b
Suppress console.log
2021-06-29 09:44:57 +02:00
dad8cdef8b
Merge branch 'develop' of github.com:thecodingmachine/workadventure into OpenWebSiteScriptAllowAPI
2021-06-29 09:42:20 +02:00
e1fd474420
Merge branch 'develop' of github.com:thecodingmachine/workadventure into main
2021-06-29 09:40:33 +02:00
ec75509725
Merge pull request #839 from ValdoTR/new-favicon
...
Updated favicons
2021-06-29 09:03:15 +02:00
44791d113d
Merge branch 'develop' of github.com:thecodingmachine/workadventure into main
2021-06-29 07:52:33 +02:00
723001e1e7
Added better favicon
2021-06-29 00:12:00 +01:00
389ca25b6a
Cowebsite opened by script can use Iframe Api
2021-06-28 18:00:48 +02:00
4cf5a6f7a0
Merge branch 'develop' of https://github.com/thecodingmachine/workadventure into new-favicon
2021-06-28 15:56:28 +01:00
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
3fd4f9d384
Adding a warning message if an unauthorized iFrame tries to communicate with WA
...
Closes #1241
2021-06-28 15:20:27 +02:00
f13282f424
Merge branch 'develop' of github.com:thecodingmachine/workadventure into main
2021-06-28 15:02:24 +02:00
0c5774a48f
Merge pull request #1229 from jonnytest1/cache-fix
...
immutableData was never assigned
2021-06-28 14:18:45 +02:00
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
303d2a7837
Adding a warning regarding the "controlled" XSS in iframe.html
2021-06-28 13:55:17 +02:00
7f79c2dc4a
Making the test page URL dynamic depending on the environment
2021-06-28 13:54:49 +02:00
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
c29ada18e9
formatting
2021-06-25 16:32:48 +02:00
07b6fce877
re-adding popup-input, video container fix
2021-06-25 11:34:27 +02:00
0bb39a6a5d
Merge branch 'develop' of github.com:thecodingmachine/workadventure into main
2021-06-24 18:28:04 +02:00
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
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
3cb877cee0
Merge branch 'develop' of github.com:thecodingmachine/workadventure into main
2021-06-24 15:42:47 +02:00
8c8649b584
Merge pull request #1232 from thecodingmachine/fixCollides
...
Fix collides
2021-06-24 15:19:10 +02:00
66bceb577a
Merge pull request #1233 from thecodingmachine/fixMenuCrash
...
FIX: solved a menu crash
2021-06-24 13:51:58 +02:00
f4d2897957
Merge branch 'develop' of github.com:thecodingmachine/workadventure into main
2021-06-24 13:02:41 +02:00
a094e16c1f
FIX: solved a menu crash
2021-06-24 12:14:28 +02:00
dcc7f2a686
Fix collides
2021-06-24 12:10:44 +02:00
2f282e3469
peerStore loading order caused issues. Fixed in GameScene (+ extracted a few stores in their files)
2021-06-24 11:54:09 +02:00
6ed8ce9af1
Merge pull request #1163 from thecodingmachine/svelte_video_overlay
...
Migrating the video overlay in Svelte
2021-06-24 10:53:35 +02:00
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
8d59680de5
Removing useless code
2021-06-24 10:36:47 +02:00
5ed61012f0
Created a PeerStatus type instead of "connecting" | "connected" | "error" | "closed"
2021-06-24 10:34:36 +02:00
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
3e464580ea
Fixing eslint ignore broken by Prettier
2021-06-24 10:23:32 +02:00
10c3d6dee2
Applying Prettier on pusher and back
2021-06-24 10:09:10 +02:00
ab20a074fe
Merge branch 'develop' of github.com:thecodingmachine/workadventure into main
2021-06-24 09:47:16 +02:00
418dd4a6c5
merge dev
2021-06-24 08:56:29 +02:00
d1178b1a01
immutableData was never assigned
2021-06-23 20:19:38 +02:00
06b7f5ba2f
Applying prettier in CI for pusher and back containers
2021-06-23 17:13:16 +02:00
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
0828dd8af3
Making max line length to 120
2021-06-23 16:58:57 +02:00
_Bastler