Commit Graph

2513 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
321fff24e6 Filled the Changelog with past changes 2021-06-22 18:09:55 +02:00
David Négrier
1ef1a1cb22 Removing useless import 2021-06-22 17:47:54 +02:00
David Négrier
d7ff8e4be6
Merge pull request #1215 from thecodingmachine/correctionCustomizeWOKA
Correction of button customize WOKA scene issue
2021-06-22 17:29:52 +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
f3086fe49a
Merge pull request #1218 from thecodingmachine/rex_outline
Enabling Outline back on actionable objects
2021-06-22 16:39:34 +02:00