_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,472 Commits 2 Branches 0 Tags 47 MiB
066ffe8bfd
Commit Graph

3472 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot[bot]
25d1e575ef
Bump hosted-git-info from 2.8.8 to 2.8.9 in /maps 
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9.
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
- [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-10 16:57:45 +00:00
David Négrier
4606173ed1
Merge pull request #1003 from thecodingmachine/dependabot/npm_and_yarn/messages/lodash-4.17.21 
Bump lodash from 4.17.20 to 4.17.21 in /messages
 2021-05-10 18:57:30 +02:00
David Négrier
954b87db41
Merge pull request #1002 from thecodingmachine/dependabot/npm_and_yarn/maps/lodash-4.17.21 
Bump lodash from 4.17.20 to 4.17.21 in /maps
 2021-05-10 18:57:16 +02:00
David Négrier
cd8501d80e
Merge pull request #1001 from thecodingmachine/dependabot/npm_and_yarn/uploader/lodash-4.17.21 
Bump lodash from 4.17.20 to 4.17.21 in /uploader
 2021-05-10 18:57:04 +02:00
GRL
cf811c547b documentation of show/hide layer simplification 2021-05-10 17:29:50 +02:00
GRL
973b3405ef documentation of show/hide layer 2021-05-10 15:10:11 +02:00
GRL
fd931c4884 Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi 2021-05-10 14:45:41 +02:00
GRL
8edd29abaa suppression console.log 2021-05-10 14:43:00 +02:00
dependabot[bot]
3b6daa99c0
Bump hosted-git-info from 2.8.8 to 2.8.9 in /back 
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9.
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
- [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-10 11:50:12 +00:00
Kharhamel
6e868408ed
Merge pull request #1018 from thecodingmachine/fixStagingBuild 
added back automatic deploy of staging 3
 2021-05-10 12:45:25 +02:00
kharhamel
d1f1c8f470 added back automatic deploy of staging 3 2021-05-10 12:44:35 +02:00
David Négrier
d2bab4e7ef
Merge pull request #1017 from thecodingmachine/change_xxxplayercontrol_name 
Renaming restorePlayerControls/disablePlayerControls
 2021-05-10 12:35:34 +02:00
Kharhamel
dfc57d0529
Merge pull request #1016 from thecodingmachine/fixStagingBuild 
added back automatic deploy of staging  2
 2021-05-10 12:29:11 +02:00
kharhamel
de1768b7bb added back automatic deploy of staging 2 2021-05-10 12:20:46 +02:00
David Négrier
c025d1798b Renaming restorePlayerControls/disablePlayerControls 
Putting "controls" in the plural form:

- restorePlayerControl => restorePlayerControls
- disablePlayerControl => disablePlayerControls
 2021-05-10 12:18:06 +02:00
David Négrier
3a82481d70 Merge branch 'master' of github.com:thecodingmachine/workadventure into develop 2021-05-10 12:10:57 +02:00
David Négrier
c1da898c59
Merge pull request #1015 from thecodingmachine/markdown_doc 
Splitting scripting API doc in 2
 2021-05-10 12:09:20 +02:00
David Négrier
293c57568e Splitting scripting API doc in 2 
Splitting scripting API doc in 2 docs:

- scripting.md: contains the explaination on how to enable scripting
- api-reference.md: contains the list of all available functions
 2021-05-10 12:08:52 +02:00
Kharhamel
8cb32c34b5
Merge pull request #1014 from thecodingmachine/fixStagingBuild 
added back automatic deploy of staging
 2021-05-10 12:03:23 +02:00
kharhamel
9a8b10bbf5 added back automatic deploy of staging 2021-05-10 11:56:08 +02:00
GRL
cd2d090a8b Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi 2021-05-10 11:46:16 +02:00
GRL
841bf29764 auto update show/hide layer 2021-05-10 11:20:07 +02:00
GRL
a6ba8d41b9 implement show/hide layer with scripting 2021-05-10 11:19:18 +02:00
David Négrier
945ff446a9
Merge pull request #1012 from thecodingmachine/markdown_doc 
Adding Markdown documentation relative to scripting
 2021-05-10 10:56:43 +02:00
David Négrier
e0ac8abd51
Merge pull request #1011 from thecodingmachine/markdown_doc 
Adding Markdown documentation relative to scripting
 2021-05-10 10:54:16 +02:00
David Négrier
bc88a7d3ed Adding Markdown documentation relative to scripting 2021-05-10 10:47:55 +02:00
_Bastler
2234abb8b9 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2021-05-10 10:10:58 +02:00
jonny
ce0c7ea3eb Merge remote-tracking branch 'remotes/workadventure-main/develop' into gamestate-api-read 2021-05-10 10:01:53 +02:00
jonny
8aa34cecef Merge branch 'load-page-api' of github.com:jonnytest1/workadventure into load-page-api 2021-05-10 09:59:12 +02:00
jonny
a5260c0831 Merge remote-tracking branch 'remotes/workadventure-main/develop' into load-page-api 2021-05-10 09:58:59 +02:00
jonny
4758820aa4 Merge remote-tracking branch 'remotes/workadventure-main/develop' into menu-command-api 2021-05-10 09:54:39 +02:00
David Négrier
44eb25e9f6
Merge pull request #1006 from jonnytest1/typed-api-events 
Typed api events
 2021-05-10 09:13:49 +02:00
jonny
46996f7049 moved event trigger out of index array 2021-05-10 01:34:33 +02:00
jonny
8db72d2dfd refactored to Array of tile 2021-05-10 01:34:32 +02:00
jonny
bed45a8310 cherry pick conflicts 2021-05-10 00:31:54 +02:00
jonny
ffe03d40f5 option to update tile 
# Conflicts:
#	front/src/Api/Events/ApiUpdateTileEvent.ts
#	front/src/Api/IframeListener.ts
#	front/src/Phaser/Game/GameScene.ts
 2021-05-10 00:30:32 +02:00
jonny
91148035ec polyfill generic message event 2021-05-09 21:46:40 +02:00
jonny
cf06f29ef8 fixed cherry pick conflicts 2021-05-09 21:38:11 +02:00
jonny
8da5bf9f8e typed iframe api events 
# Conflicts:
#	front/src/Api/IframeListener.ts
#	front/src/iframe_api.ts
 2021-05-09 21:36:48 +02:00
_Bastler
deac58ebc7 merge into develop 2021-05-08 20:05:08 +02:00
jonnytest1
cb19721dca
Merge branch 'develop' into load-page-api 2021-05-07 20:02:08 +02:00
jonnytest1
2922ae4603
Merge branch 'develop' into menu-command-api 2021-05-07 19:59:58 +02:00
DESKTOP-FMM8UI0\CLV
e655edd9bd export class Popup and Soud of Iframe Api 
let become const in SoundManager
 2021-05-07 17:03:07 +02:00
dependabot[bot]
b141da1475
Bump lodash from 4.17.20 to 4.17.21 in /back 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-07 13:45:33 +00:00
dependabot[bot]
543397efe4
Bump lodash from 4.17.20 to 4.17.21 in /messages 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-07 13:45:29 +00:00
dependabot[bot]
9c620de649
Bump lodash from 4.17.20 to 4.17.21 in /maps 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-07 13:45:25 +00:00
dependabot[bot]
3a00ecab8f
Bump lodash from 4.17.20 to 4.17.21 in /uploader 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-07 13:44:51 +00:00
David Négrier
5605e63e5f
Merge pull request #998 from thecodingmachine/skiprender2 
Skip "render" if nothing changed on screen (2)
 2021-05-07 15:44:08 +02:00
Gregoire Parant
62a6eabc88 Merge branch 'master' into develop 2021-05-07 00:07:43 +02:00
grégoire parant
0e32238505
HotFix custom WOKA (#999) 2021-05-06 19:58:08 +02:00