jonny
|
b0eb241fc3
|
oO something kept movin the comment to the next line
|
2021-06-25 18:45:15 +02:00 |
|
jonny
|
bbdf0a1289
|
fixed merge conflict
|
2021-06-25 18:20:16 +02:00 |
|
jonny
|
7f61e9addd
|
Merge remote-tracking branch 'remotes/upstream/develop' into tiles-start-positions
|
2021-06-25 18:14:40 +02:00 |
|
jonny
|
abfa010bbf
|
added husky to gitignore
|
2021-06-25 18:07:03 +02:00 |
|
jonny
|
769e0fcc29
|
refactor to position object
|
2021-06-25 18:03:43 +02:00 |
|
jonny
|
c7fa5cab8b
|
cleanup
|
2021-06-25 17:57:09 +02:00 |
|
jonny
|
f536d538ea
|
added backwards compatible check and maps
|
2021-06-25 17:35:42 +02:00 |
|
_Bastler
|
c29ada18e9
|
formatting
|
2021-06-25 16:32:48 +02:00 |
|
_Bastler
|
07b6fce877
|
re-adding popup-input, video container fix
|
2021-06-25 11:34:27 +02:00 |
|
_Bastler
|
0bb39a6a5d
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure into main
|
2021-06-24 18:28:04 +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 |
|
_Bastler
|
3cb877cee0
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure into main
|
2021-06-24 15:42:47 +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 |
|
_Bastler
|
f4d2897957
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure into main
|
2021-06-24 13:02:41 +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 |
|
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 |
|
_Bastler
|
ab20a074fe
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure into main
|
2021-06-24 09:47:16 +02:00 |
|
_Bastler
|
418dd4a6c5
|
merge dev
|
2021-06-24 08:56:29 +02:00 |
|
jonny
|
d1178b1a01
|
immutableData was never assigned
|
2021-06-23 20:19:38 +02:00 |
|
jonny
|
5472d220ba
|
added trigger message code
|
2021-06-23 17:32:32 +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 |
|