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

3099 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jonny
540e5783b6 cowebsite 
navigation
sound
player
extraction
 2021-05-28 01:14:10 +02:00
jonny
ea04dd5303 Merge branch 'iframe-api-refactor' of github.com:jonnytest1/workadventure into iframe-api-refactor 2021-05-28 00:58:11 +02:00
jonny
6a90655c44 Merge branch 'develop' of https://github.com/thecodingmachine/workadventure into iframe-api-refactor 2021-05-28 00:52:42 +02:00
jonnytest1
b35207a578
Merge branch 'develop' into iframe-api-refactor 2021-05-28 00:38:12 +02:00
jonny
cbe93d7164 [WIP] fixed cherry pick conflicts 2021-05-28 00:34:40 +02:00
jonny
2de2d114a1 added typedef for subobject types 
extracted popup functions

# Conflicts:
#	front/package-lock.json
#	front/package.json
#	front/src/iframe_api.ts
 2021-05-28 00:30:51 +02:00
jonny
1a1ab30574 extraction idea 
# Conflicts:
#	front/src/Api/ScriptUtils.ts
#	front/src/iframe_api.ts
 2021-05-28 00:29:21 +02:00
David Négrier
5d8d729bd7 Uncommenting action 2021-05-27 18:25:27 +02:00
GRL
6dcb0d3750 first step to change tile 2021-05-27 17:06:39 +02:00
GRL
9cd3ff1d31 Merge branch 'correct-merge' into metadataScriptAPIV2 2021-05-27 10:16:00 +02:00
GRL
acbe4f89a6 Merge branch 'update-game-tiles' into correct-merge 2021-05-27 09:45:25 +02:00
_Bastler
05e18e0568 merge betterNameText 2021-05-26 20:31:33 +02:00
_Bastler
7bdbc191b5 merge latest dev 2021-05-26 19:14:18 +02:00
_Bastler
7e07279c88 character hotifxes 2021-05-26 18:46:25 +02:00
GRL
5565ddd3f4 Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi 2021-05-26 17:22:37 +02:00
GRL
e1f0192e61 Adding and updating test map for metadata 2021-05-26 17:18:38 +02:00
David Négrier
474323b95f
Merge pull request #933 from ClementVieilly75/SoundInMapScript 
Sound in map script
 2021-05-26 16:25:50 +02:00
David Négrier
9aed9713c8 Referencing sound test in index.html 2021-05-26 16:22:58 +02:00
David Négrier
769d9cf314 Added sound loading to changelog 2021-05-26 16:18:58 +02:00
David Négrier
870f16f9c6 Merge branch 'develop' of github.com:thecodingmachine/workadventure into SoundInMapScript 2021-05-26 16:15:33 +02:00
David Négrier
54e300443b Fixing Typing 2021-05-26 16:11:22 +02:00
David Négrier
fac6574cb5 Removing console.log and unused files 2021-05-26 16:08:43 +02:00
David Négrier
1523758106
Merge pull request #1038 from thecodingmachine/dependabot/npm_and_yarn/pusher/lodash-4.17.21 
Bump lodash from 4.17.20 to 4.17.21 in /pusher
 2021-05-26 15:50:34 +02:00
David Négrier
701710a2a1
Merge pull request #1037 from thecodingmachine/dependabot/npm_and_yarn/pusher/hosted-git-info-2.8.9 
Bump hosted-git-info from 2.8.8 to 2.8.9 in /pusher
 2021-05-26 15:50:17 +02:00
David Négrier
728c2ee092
Merge pull request #1026 from thecodingmachine/dependabot/npm_and_yarn/messages/hosted-git-info-2.8.9 
Bump hosted-git-info from 2.8.8 to 2.8.9 in /messages
 2021-05-26 15:49:57 +02:00
dependabot[bot]
faff263b80
Bump hosted-git-info from 2.8.8 to 2.8.9 in /pusher 
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-26 13:49:56 +00:00
David Négrier
62627ba1b0
Merge pull request #1025 from thecodingmachine/dependabot/npm_and_yarn/benchmark/hosted-git-info-2.8.9 
Bump hosted-git-info from 2.8.8 to 2.8.9 in /benchmark
 2021-05-26 15:49:42 +02:00
David Négrier
a1022f768b
Merge pull request #1024 from thecodingmachine/dependabot/npm_and_yarn/uploader/hosted-git-info-2.8.9 
Bump hosted-git-info from 2.8.8 to 2.8.9 in /uploader
 2021-05-26 15:49:29 +02:00
David Négrier
1bf4475e1b
Merge pull request #1023 from thecodingmachine/dependabot/npm_and_yarn/maps/hosted-git-info-2.8.9 
Bump hosted-git-info from 2.8.8 to 2.8.9 in /maps
 2021-05-26 15:49:17 +02:00
David Négrier
f67ca05147
Merge pull request #1020 from thecodingmachine/dependabot/npm_and_yarn/back/hosted-git-info-2.8.9 
Bump hosted-git-info from 2.8.8 to 2.8.9 in /back
 2021-05-26 15:49:03 +02:00
David Négrier
796aaf82ce
Merge pull request #1060 from thecodingmachine/media_manager_store 
Switching MediaManager to using a Svelte store
 2021-05-26 15:25:15 +02:00
David Négrier
6d15921674 Fixing screen-sharing button not hidden anymore when hovering button 2021-05-26 12:30:56 +02:00
David Négrier
4f1cab5afe Fixing comments 2021-05-26 12:19:58 +02:00
David Négrier
4c4f310b79 The share screen button is now displayed only when screen sharing makes sense. 
Also, fixed the button not aligned bug
 2021-05-26 12:12:47 +02:00
David Négrier
dd428bc1e1 Migrating screen sharing to using a store 2021-05-26 12:12:47 +02:00
David Négrier
d32df13f1b Camera now show up when someone is moving and hides 5 seconds after we stop moving. 
Also, added an animation to show/hide the webcam.
 2021-05-26 12:12:46 +02:00
David Négrier
8af8ccd54b Migrating MediaManager game part to Svelte store 2021-05-26 12:12:18 +02:00
David Négrier
28d78a7988 Switching MediaManager to using a Svelte store 
This allows cleaner and more expressive code, especially regarding whether the webcam should be on or off.
 2021-05-26 12:11:16 +02:00
David Négrier
4f4d2532b7
Merge pull request #1082 from thecodingmachine/disabling_physics_optim 
Moving Physics optim to DirtyScene
 2021-05-26 12:08:57 +02:00
David Négrier
bc19cbd525 Moving Physics optim to DirtyScene 
The Physics engine is now disabled only if no sprites are moving (if they have no velocity).
Also, if a sprite is moving (if it has a velocity), the dirty state is set.
 2021-05-26 12:00:27 +02:00
GRL
17261dfab6 Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi 2021-05-26 10:58:25 +02:00
GRL
c8e2416e08 documentation of getCurrentUser, getCurrentRoom and on working with group layer 2021-05-26 10:41:33 +02:00
Kharhamel
177f0eb053
Merge pull request #863 from thecodingmachine/emote 
FEATURE: added the possibility to play emotes
 2021-05-26 10:26:13 +02:00
_Bastler
058006a285 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-05-25 20:44:23 +02:00
GRL
b4fa38bf8c Merge remote-tracking branch 'origin/metadataScriptingApi' into metadataScriptingApi 2021-05-25 17:21:12 +02:00
GRL
a5cb93541a correction from code review 2021-05-25 17:21:02 +02:00
kharhamel
595c5ca64d now use custom emotes with tweens instead of transistions 2021-05-25 16:37:24 +02:00
GRL78
7c44d747de
Apply suggestions from code review 
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
 2021-05-25 11:02:25 +02:00
David Négrier
2814a95a74
Merge pull request #1081 from thecodingmachine/disable_tsx_for_maps 
Removing parsing of TSX files in "maps" container
 2021-05-25 10:51:52 +02:00
David Négrier
4d18e0ceb4 Removing parsing of TSX files in "maps" container 
The TSX extension is used by Typescript (for JSX like files) but ALSO by Tiled (for tilesets).
We don't need the Typescript TSX files so this PR is preventing Typescript from parsing those files in the "maps" container.
 2021-05-25 10:43:01 +02:00