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

2695 Commits

Author SHA1 Message Date
David Négrier
3988559d2a Removing old unused images 
Just a bit of cleanup!
 2022-03-15 13:51:10 +01:00
David Négrier
b6b6c7f15f Adding error case when texture is empty 2022-03-14 14:28:42 +01:00
David Négrier
52b5027702 Adding source maps to production build. 2022-03-14 13:55:30 +01:00
David Négrier
352f144e97
Merge pull request #1963 from thecodingmachine/develop 
Deploy 2022-03-14
 2022-03-14 13:01:10 +01:00
_Bastler
9eec503215 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-03-14 10:33:34 +01:00
Piotr Hanusiak
d4dcd0d5ce
Actions menu api (#1862) 
* wip

* wip

* random action on click

* removing actions

* register single key per command use

* change removeActionsMenu action name

* fixed actions menu not hiding content properly:

* actions menu fix

* added mock Block Player action

* ActionsMenu buttons styling

* added displaying priority for menu actions

* moved utils actionMenu features to the UI

* import as a type:

* more object oriented style for API

* removed registered actions from RemotePlayer instance

* readme update

* Fixing typos / Improving wording

* added instructions on AlterActionsMenu test map

Co-authored-by: Hanusiak Piotr <piotr@ltmp.co>
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
 2022-03-14 10:15:10 +01:00
Lurkars
55db6a9b12
apply textures on openid login, fix pusher errors on woka list (#1961) 
* apply textures on openid login, fix pusher errors on woka list

* remove logging

* Returning a HTTP 400 id roomUrl parameter not set

Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
 2022-03-14 10:14:35 +01:00
_Bastler
df094d30a2 fix woka-list 2022-03-13 15:49:21 +01:00
_Bastler
366231df98 textures on auth 2022-03-13 09:27:35 +01:00
_Bastler
0e1ba49a3e Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-03-13 09:25:25 +01:00
David Négrier
6540f15c5b
Refactoring Woka management (#1810) 
* Wrap websockets with HyperExpress

* Add endpoints on pusher to resolve wokas

* getting textures urls from pusher

* Adding OpenAPI documentation for the pusher.

The pusher now exposes a "/openapi" endpoint and a "/swagger-ui/" endpoint.

* revert FRONT_URL

* playerTextures metadata is being loaded via Phaser.Loader

* fetch textures every time character or customize scene is open

* Heavy changes: refactoring the pusher to always send the textures (and the front to accept them)

* Sending character layer details to admin

* Cleaning commented code

* Fixing regex

* Fix woka endpoints on pusher

* Change error wording on pusher

* Working on integration of the woka-list with the new admin endpoint.

* Switching from "name" to "id" in texture object + using zod for woka/list validation

* Add position on default woka data

* Remove async on pusher option method

* Fix woka list url

* add options for /register

* Fxiing loading the Woka list

* Actually returning something in logout-callback

* Copying messages to back too

* remove customize button if no body parts are available (#1952)

* remove customize button if no body parts are available

* remove unused position field from PlayerTexturesCollection interface

* removed unused label field

* fix LocalUser test

* little PlayerTextures class refactor

* Fixing linting

* Fixing missing Openapi packages in prod

* Fixing back build

Co-authored-by: Hanusiak Piotr <piotr@ltmp.co>
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>

* Add returns on pusher endpoints

Co-authored-by: Alexis Faizeau <a.faizeau@workadventu.re>
Co-authored-by: Hanusiak Piotr <piotr@ltmp.co>
Co-authored-by: Piotr Hanusiak <wacneg@gmail.com>
 2022-03-11 17:02:58 +01:00
_Bastler
4e6a622546 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-03-09 20:29:52 +01:00
Piotr Hanusiak
0196eae055
async call for recalculating tiles costs (#1890) 
* async call for recalculating tiles costs

* fixed setWalkingCostGrid still being a blocking process

* set exits tiles cost from the start

* removed typing error from code

Co-authored-by: Hanusiak Piotr <piotr@ltmp.co>
 2022-03-08 16:28:54 +01:00
_Bastler
0d4091c431 unused import 2022-03-08 15:20:00 +01:00
_Bastler
633d56fc67 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-03-08 15:17:37 +01:00
Lukas
7b26d16868
lazy load EmoteMenu (#1938) 2022-03-08 11:56:34 +01:00
Lukas
2938aba484
Multi-platform images (#1924) 
* base front production image on official nginx

* build multi-platform docker images

* build message types outside docker

* set docker build context to path

* build message types before running e2e tests

* add build for arm/v7

* remove build for arm/v7

* increase yarn network timeout

* set front port to 80

* add git labels to images

https://github.com/docker/build-push-action/blob/master/UPGRADE.md#tags-with-ref-and-git-labels

* add images input

* Adding back commented code in the Dockerfile (the protobuf message building).

This way, when node-grpc supports ARM64, we can uncomment the code again.

Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
Co-authored-by: Lukas Hass @lukashass
 2022-03-08 11:21:17 +01:00
_Bastler
bc33d88726 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-03-07 19:06:17 +01:00
David Négrier
07a4df8ad4 Importing Window object back in Iframe API 2022-03-07 18:35:17 +01:00
Anton Bracke
4535a8ae96
Merge remote-tracking branch 'upstream/develop' into electron 2022-03-03 14:43:33 +01:00
_Bastler
e87052ecc6 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-28 19:12:42 +01:00
_Bastler
6faa31427b fix iframe 2022-02-28 14:52:44 +01:00
_Bastler
ae376f25c4 Merge branch 'develop' of ssh://git.bstly.de:222/_Bastler/partey_workadventure 2022-02-28 14:16:09 +01:00
Lurkars
0a2bfc556f Merge branch 'develop' of github.com:thecodingmachine/workadventure into oidcProfile 2022-02-28 10:35:15 +01:00
_Bastler
946a4d75e9 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-28 09:20:50 +01:00
Lurkars
c3b3d5e9d6
Fix nginx.conf to work with OIDC (#1932) 
* fix nginx.conf to work with OIDC
* rewrite like .htaccess
 2022-02-28 09:07:38 +01:00
_Bastler
8bc66723d5 fix nginx.conf 2022-02-27 14:52:57 +01:00
_Bastler
c12582c329 fix nginx.conf 2022-02-27 14:52:13 +01:00
_Bastler
51719660d9 Merge branch 'develop' of ssh://git.bstly.de:222/_Bastler/partey_workadventure 2022-02-27 14:39:42 +01:00
_Bastler
86dc0d4aa8 add DOMPurify 2022-02-27 14:37:26 +01:00
_Bastler
9e86e95135 merge latest dev 2022-02-27 14:19:39 +01:00
_Bastler
2622041740 orig. formatting 2022-02-27 13:59:05 +01:00
_Bastler
03ee2eb49a update dockerfile 2022-02-26 11:27:47 +01:00
_Bastler
36a4b140ba rename images 2022-02-26 11:19:48 +01:00
_Bastler
0e1dff6a11 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop_vite 2022-02-26 11:11:51 +01:00
Lukas
f1cba60825
base front production image on official nginx image 2022-02-25 20:32:10 +01:00
Lukas
3f3af9b957
improve docker build caching 
install dependencies before copying source into image
 2022-02-25 18:53:14 +01:00
_Bastler
7e9196a8a0 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop_vite 2022-02-25 14:16:19 +01:00
David Négrier
3a9ce7615d
Merge pull request #1914 from thecodingmachine/dependabot/npm_and_yarn/front/ansi-regex-5.0.1 
Bump ansi-regex from 5.0.0 to 5.0.1 in /front
 2022-02-25 14:10:21 +01:00
_Bastler
ac4f16ad03 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop_vite 2022-02-23 17:07:14 +01:00
_Bastler
021a2511e0 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop_vite 2022-02-23 16:59:15 +01:00
Hanusiak Piotr
9fe4782fbd clear hashParams after moving player with moveTo param 2022-02-23 10:14:09 +01:00
Gregoire Parant
07d399403b Refactor how to use new Jitsi icon 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-02-23 00:27:07 +01:00
Gregoire Parant
658781e02e Merge branch 'master' into develop 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

# Conflicts:
#	front/public/resources/logos/meet.svg
 2022-02-22 23:40:48 +01:00
Gregoire Parant
3541f153fa Push Jitsi icon 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-02-22 23:37:28 +01:00
Anton Bracke
4e243151dd
add desktop api to front 2022-02-22 16:57:56 +01:00
dependabot[bot]
3aef82303c
Bump ansi-regex from 5.0.0 to 5.0.1 in /front 
Bumps [ansi-regex](https://github.com/chalk/ansi-regex) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/chalk/ansi-regex/releases)
- [Commits](https://github.com/chalk/ansi-regex/compare/v5.0.0...v5.0.1)

---
updated-dependencies:
- dependency-name: ansi-regex
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-21 16:27:29 +00:00
Gregoire Parant
0943ec8991 Define color text by brightness 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-02-21 01:09:53 +01:00
Gregoire Parant
070ad6b993 Add jiti logo for Jitsi button meeting 2022-02-20 23:38:20 +01:00
Gregoire Parant
23f7d6f08f Update CoWebsite Jitsi 
- Change Jitsi meeting icon
 - Add Jitsi meeting information

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-02-20 23:28:27 +01:00
_Bastler
ddf62107f2 Merge branch 'develop' of ssh://git.bstly.de:222/_Bastler/partey_workadventure 2022-02-20 13:55:41 +01:00
_Bastler
90a69b0704 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-20 13:55:11 +01:00
_Bastler
667e3c0944 Merge branch 'develop' of ssh://git.bstly.de:222/_Bastler/partey_workadventure 2022-02-20 13:28:29 +01:00
_Bastler
f7167537c3 fix dockerfile 2022-02-20 13:28:10 +01:00
Lukas Hass
3ee9b26650
use optional chaining 2022-02-19 20:25:17 +01:00
Lukas Hass
e8d5335bc0
Merge branch 'develop' into vite 2022-02-19 20:08:50 +01:00
_Bastler
7701e44715 Merge branch 'develop' of ssh://git.bstly.de:222/_Bastler/partey_workadventure 2022-02-19 10:15:56 +01:00
Lukas Hass
cc24fd48d5
update generic-type-guard and @geprog/vite-plugin-env-config 
allows to get rid of node built-in polyfills
 2022-02-19 00:13:25 +01:00
Gregoire Parant
e4f9f89a40 Fix pretty 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-02-18 21:57:11 +01:00
Gregoire Parant
26f5416b63 Fix svelt check 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-02-18 21:44:17 +01:00
Gregoire Parant
3a734cc2ae Enable limitation freemium 
- Fix warning message
 - Fix post message API pusher

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-02-18 21:33:23 +01:00
_Bastler
136269170d Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-18 09:56:05 +01:00
dependabot[bot]
707b78b506
Bump url-parse from 1.5.3 to 1.5.7 in /front 
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.3 to 1.5.7.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.3...1.5.7)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-17 14:52:03 +00:00
Lukas Hass
2755489ccf
Merge branch 'develop' into vite 2022-02-17 15:20:58 +01:00
Lukas Hass
c163107875
import browserified version of simple-peer 2022-02-17 15:02:48 +01:00
Hanusiak Piotr
ecd4b5907a disable corner cutting 2022-02-17 12:44:57 +01:00
Alexis Faizeau
f186111d2f Fix importing coWesbite from API to store 2022-02-17 09:51:32 +01:00
_Bastler
b1728b7b8c Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-16 20:25:12 +01:00
Gregoire Parant
f0c7e4ea8a Update css warning message & add message button 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-02-16 20:15:16 +01:00
David Négrier
eae6c2c5e3
Merge pull request #1887 from thecodingmachine/master 
Backporting cowebsites hot-fixes
 2022-02-16 18:03:23 +01:00
David Négrier
a7264954ea
Merge pull request #1820 from thecodingmachine/feature-voice-chat-indicator 
Feature voice chat indicator
 2022-02-16 16:46:13 +01:00
Hanusiak Piotr
e590cee753 forcing close talkIcon indicator when leaving bubble conversation 2022-02-16 15:55:07 +01:00
Hanusiak Piotr
0b0d3b5beb fixed issue with chat indicator persisting after being out of conversation 2022-02-16 14:56:59 +01:00
Hanusiak Piotr
dea5784c9b Merge branch 'develop' into feature-voice-chat-indicator 2022-02-16 14:37:01 +01:00
Hanusiak Piotr
3c54e38401 unlock diagonal movement 2022-02-16 14:28:35 +01:00
Hanusiak Piotr
3875d3b0f5 Merge branch 'develop' into avoid-exits-on-path 2022-02-16 14:03:48 +01:00
_Bastler
dca2cc3c6c Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-16 09:16:54 +01:00
Lurkars
2816946c94 add OIDC username + locale 2022-02-16 09:11:08 +01:00
Lukas Hass
620e218612
remove iframe.html 2022-02-15 20:19:45 +01:00
Alexis Faizeau
06dd2202f6 Fix hidden main cowebsite swape 2022-02-15 17:28:15 +01:00
Alexis Faizeau
a52ad233d8 Fix cowebsite swap 2022-02-15 17:28:02 +01:00
Alexis Faizeau
0f16d909e7 The second opened cowebsite must be displayed on highlighted 2022-02-15 17:27:32 +01:00
Lukas Hass
cdc3d182bc
fix comparison that is always false 2022-02-15 12:00:32 +01:00
Lukas Hass
8c96a986fb
remove webpack reference 2022-02-15 11:07:04 +01:00
_Bastler
9cfe75f4d1 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-15 08:14:24 +01:00
_Bastler
d63a32e94e Co-Wesbite 2022-02-15 08:13:53 +01:00
Lukas Hass
779f5c1fdb
Merge branch 'develop' into vite 2022-02-14 22:11:53 +01:00
Lukas Hass
ae8c18fa4b
prevent reading property 'collides' of undefined 
fixes e2e tests
 2022-02-14 22:07:15 +01:00
David Négrier
8c8fdb9ee0
Merge pull request #1858 from thecodingmachine/dependabot/npm_and_yarn/front/follow-redirects-1.14.8 
Bump follow-redirects from 1.14.7 to 1.14.8 in /front
 2022-02-14 22:04:22 +01:00
Lukas Hass
ae46a1faf1
Merge branch 'develop' into vite 2022-02-14 19:47:27 +01:00
David Négrier
7a44f3dcb8
Merge pull request #1853 from anbraten/remove-external-deps 
Bundle nes.css and quill-js
 2022-02-14 18:46:19 +01:00
Hanusiak Piotr
6f41622263 unignoring resources directory 2022-02-14 16:26:50 +01:00
David Négrier
9bfce8412a Adding a missing translation for "Visiting card" 
Also, changing "Visiting Card" to "Business Card" in English
 2022-02-14 16:00:53 +01:00
_Bastler
5451fc788d Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-14 12:57:46 +01:00
Hanusiak Piotr
639c456540 use png instead of svg for talk icon 2022-02-14 10:37:13 +01:00
Anton Bracke
aef64afdb9
fix quill import 2022-02-13 20:20:38 +01:00
Lukas Hass
29cdb1a8e5
Merge branch 'develop' into vite 2022-02-13 11:46:26 +01:00
dependabot[bot]
c6b125b347
Bump follow-redirects from 1.14.7 to 1.14.8 in /front 
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-13 09:55:59 +00:00
Lurkars
7da4fd7da6 merge latest translations 2022-02-12 14:37:25 +01:00
_Bastler
fe2ed33d5f Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-12 13:36:30 +01:00