_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,960 Commits 2 Branches 0 Tags 47 MiB
b03e7ec8f6
Commit Graph

2960 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
GRL
d10e2dbca7 Migration of report menu in svelte 2021-08-09 16:56:28 +02:00
grégoire parant
a5b44be6a1
Update JWT expires days (#1349) 2021-08-09 16:37:24 +02:00
grégoire parant
ddecf48697
Update JWT expires days (#1347) 2021-08-09 16:31:55 +02:00
GRL
56fa2e49f6 New menu svelte 2021-08-09 14:49:17 +02:00
Datalog-Mindhack
bc24a6b1db
Update package.json (#1344) 
Thans for your Merge Request 🚀
 2021-08-09 14:36:53 +02:00
Lurkars
06290cdd78 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2021-08-08 19:33:58 +02:00
Gregoire Parant
154f8f03da Merge branch 'master' into develop 2021-08-06 18:29:09 +02:00
grégoire parant
fbcb9d898d
Update report message (#1343) 2021-08-06 18:28:18 +02:00
felixdoerre
d051650457
Delete sol_intérieur.png (#1341) 
The file was initially renamed but accidentally re-added later. Removing it finished the move.
 2021-08-06 17:23:22 +02:00
Gregoire Parant
af613f5b5b Merge branch 'master' into develop 2021-08-06 15:53:33 +02:00
GRL78
e0fb31fc58
WIP: Migrate AudioManager in Svelte (#1325) 
* Migrate AudioManager in Svelte

* use import type when needed
 2021-08-06 09:11:17 +02:00
David Négrier
ac282db1ac Removing pointless console.log 2021-08-05 17:21:55 +02:00
David Négrier
56cf535551
Merge pull request #1312 from thecodingmachine/iframe_in_map 
Adding the ability to inject websites directly inside maps
 2021-08-05 12:44:23 +02:00
David Négrier
6b9b999996 Making embedded iframes scriptable using the WA.room.website namespace. 2021-08-05 12:37:05 +02:00
David Négrier
5bb29e99ba Adding a "allowApi" property to authorize the API in a website. 2021-08-05 12:30:07 +02:00
David Négrier
ce3c53ae3f Adding the ability to inject websites directly inside maps 
This PR adds the ability to inject a website INSIDE a map (as an iframe inside a Phaser HTML object)
The iFrame will be rendered transparently, unless you set a background-color on the body, which opens a number of cool possibilities.

Needs to be done: allowing the iframe API in those iframes.
 2021-08-05 12:30:05 +02:00
David Négrier
a09f27b448
Merge pull request #1227 from jonnytest1/trigger-message-refv3 
trigger message api refactorv3
 2021-08-05 12:18:55 +02:00
David Négrier
570110f831 Fixing openWebsiteTriggerMessage not hidden when moving out of zone. 2021-08-05 12:07:12 +02:00
David Négrier
bc1c6a4986 Refactoring displayActionMessage signature. Now accepting an options object. This should allow for more options in the future. 2021-08-05 12:02:00 +02:00
David Négrier
87e4367455 Refactoring layoutManagerActionStore. It now supports an uuid field. 
layoutManagerVisibilityStore is now a derived field from layoutManagerActionStore.
 2021-08-05 11:19:28 +02:00
GRL
2cd5b7f0a8 Merge branch 'develop' of github.com:thecodingmachine/workadventure into MenuSvelte 2021-08-05 10:01:23 +02:00
David Négrier
92fee33b64 Merge branch 'develop' of github.com:thecodingmachine/workadventure into trigger-message-refv3 2021-08-05 09:24:05 +02:00
David Négrier
d1e5d57459 Changing the method name from "triggerMessage" to "displayActionMessage". 
Generally speaking, I like to call the message at the bottom an "action message".
And things can "trigger" it, but in the case of a method that actually proactively displays the message, I find "displayActionMessage" to be a better name.

Also, removing package-lock files and improving code style
 2021-08-05 09:17:33 +02:00
dependabot[bot]
2e3489a489
Bump tar from 4.4.13 to 4.4.15 in /back 
Bumps [tar](https://github.com/npm/node-tar) from 4.4.13 to 4.4.15.
- [Release notes](https://github.com/npm/node-tar/releases)
- [Changelog](https://github.com/npm/node-tar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-tar/compare/v4.4.13...v4.4.15)

---
updated-dependencies:
- dependency-name: tar
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-05 03:09:10 +00:00
grégoire parant
d644b43e24
Merge pull request #1330 from thecodingmachine/layoutManagerSvelte 
Migrate layoutManager in Svelte
 2021-08-04 21:01:29 +02:00
grégoire parant
7c11441f50
Merge pull request #1336 from thecodingmachine/HotFixJoystickMobile 
Fix joystick postion
 2021-08-04 18:42:31 +02:00
Gregoire Parant
190007a21f Fix joystick postion 
- Aply new size after open and close iframe and permit to keep the good position of the joystick on the WorkAdventure screen
 2021-08-04 18:07:04 +02:00
grégoire parant
238d5c22db
Merge pull request #1334 from thecodingmachine/PWAIcon 
Update PWA apple icon
 2021-08-04 15:05:57 +02:00
Gregoire Parant
f9992876df Update PWA apple icon 2021-08-04 15:05:11 +02:00
grégoire parant
588af2e3cc
Merge pull request #1333 from thecodingmachine/ImproveWA 
Force to add service worker js file
 2021-08-04 14:32:17 +02:00
Gregoire Parant
383bbbdafe Force to add service worker js file 2021-08-04 14:31:12 +02:00
grégoire parant
3df5eece38
Merge pull request #1331 from thecodingmachine/UpdatePWA 
Update PWA design
 2021-08-04 13:53:13 +02:00
Gregoire Parant
707040b506 improve PWA and last room strating 2021-08-04 13:33:58 +02:00
David Négrier
82832b7055 Adding a test case for WA.ui.triggerMessage 2021-08-03 22:37:49 +02:00
David Négrier
4713010929 Merge branch 'develop' of github.com:thecodingmachine/workadventure into trigger-message-refv3 2021-08-03 19:01:16 +02:00
Gregoire Parant
1ad9f5b045 Add new icon manifest 2021-08-03 17:49:25 +02:00
Gregoire Parant
d781b2eb91 Update favicon and service worker html 2021-08-03 17:28:27 +02:00
GRL
fe585297fc Merge branch 'develop' of github.com:thecodingmachine/workadventure into MenuSvelte 2021-08-03 17:19:47 +02:00
GRL
2d8098b06d Merge branch 'develop' of github.com:thecodingmachine/workadventure into layoutManagerSvelte 2021-08-03 11:40:51 +02:00
GRL
1436b15328 Migrate layoutManager in Svelte 2021-08-03 11:13:08 +02:00
David Négrier
4293ea320d Hotfix: if an error occurs while loading the map (because the map is not accessible from the WorkAdventure servers), the application does not prevent users from connecting. 2021-08-03 10:08:53 +02:00
grégoire parant
d568fd596b
Merge pull request #1329 from thecodingmachine/develop 
Add feature Release 1.4.11
 2021-08-03 00:47:09 +02:00
Gregoire Parant
952e58ecc1 Fix ban message style 2021-08-03 00:34:07 +02:00
grégoire parant
71e3b9dfc1
Merge pull request #1308 from thecodingmachine/GlobalMessageToWorld 
Send a message to all the room of a world from Console Admin
 2021-08-02 23:50:54 +02:00
Gregoire Parant
14b4229019 Merge branch 'develop' into GlobalMessageToWorld 
# Conflicts:
#	CHANGELOG.md
#	front/src/Api/Events/IframeEvent.ts
#	front/src/Components/App.svelte
#	pusher/src/Services/SocketManager.ts
 2021-08-02 23:07:39 +02:00
grégoire parant
35f0c945fd
Merge pull request #1328 from thecodingmachine/develop 
BugFix Release 1.4.11
 2021-08-02 22:46:32 +02:00
Gregoire Parant
2480d13f58 Merge branch 'master' into develop 2021-08-02 22:26:34 +02:00
Gregoire Parant
e07f4bf96f Add comment 2021-08-02 22:24:00 +02:00
grégoire parant
fbe7440e24
Merge pull request #1320 from thecodingmachine/loadTileset 
Load a json file that describe a tileset in Tile format.
 2021-08-02 22:19:49 +02:00
Gregoire Parant
f2d382681b Merge branch 'develop' into loadTileset 
# Conflicts:
#	CHANGELOG.md
#	front/src/Phaser/Game/GameScene.ts
 2021-08-02 22:16:05 +02:00