noby
/
workadventure
2
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,250 Commits 1 Branch 0 Tags 26 MiB
Commit Graph

1250 Commits

Author SHA1 Message Date
Thomas Basler 92ce52cdb3 Merge remote-tracking branch 'upstream/develop' into develop 2021-01-07 14:17:36 +01:00
Kharhamel c2d0cda441
Merge pull request #572 from thecodingmachine/master 
Master
 2021-01-07 14:00:45 +01:00
Kharhamel 186114a4e2
Merge pull request #562 from thecodingmachine/phaser35 
updated phaser to version 3.51 and fixed the BC breaks
 2021-01-07 13:57:08 +01:00
Thomas Basler 952d9d3fca Repalced var by let 2021-01-07 12:48:31 +01:00
kharhamel 3ce8427378 fixed a game crashed because of lack of animations and improved the character class 2021-01-07 12:46:13 +01:00
Thomas Basler f6c7c466eb Added environment variable to set default map url 2021-01-06 23:30:14 +01:00
Thomas Basler 3b91581917 Merge remote-tracking branch 'upstream/develop' into develop 2021-01-06 18:07:10 +01:00
kharhamel fbb44af369 added a basic loader 2021-01-06 17:08:48 +01:00
Kharhamel 0ebf8798ea
Merge pull request #558 from thecodingmachine/dependabot/npm_and_yarn/back/axios-0.21.1 
Bump axios from 0.20.0 to 0.21.1 in /back
 2021-01-06 16:59:14 +01:00
Thomas Basler 4781a93ba4 Merge remote-tracking branch 'upstream/develop' into develop 2021-01-06 16:01:08 +01:00
dependabot[bot] 358292840b
Bump axios from 0.20.0 to 0.21.1 in /back 
Bumps [axios](https://github.com/axios/axios) from 0.20.0 to 0.21.1.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v0.21.1/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.20.0...v0.21.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-01-06 14:41:45 +00:00
Kharhamel de56f2e6c9
Merge pull request #560 from thecodingmachine/dependabot/npm_and_yarn/pusher/axios-0.21.1 
Bump axios from 0.20.0 to 0.21.1 in /pusher
 2021-01-06 15:41:02 +01:00
Thomas Basler 45ab174dab Fix typo 2021-01-06 15:35:09 +01:00
kharhamel 1359fbe977 updated phaser to version 3.51 and fixed the BC 2021-01-06 15:00:54 +01:00
Thomas Basler 92b386580f Merge remote-tracking branch 'upstream/develop' into develop 2021-01-06 14:47:54 +01:00
Thomas Basler 7874c89c1a Fix exception in javascript console by commenting not required function 2021-01-06 13:07:50 +01:00
dependabot[bot] 3e0b85701c
Bump axios from 0.20.0 to 0.21.1 in /pusher 
Bumps [axios](https://github.com/axios/axios) from 0.20.0 to 0.21.1.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v0.21.1/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.20.0...v0.21.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-01-06 10:33:33 +00:00
David Négrier 178af22280
Merge pull request #557 from thecodingmachine/dependabot/npm_and_yarn/back/systeminformation-4.31.1 
Bump systeminformation from 4.30.5 to 4.31.1 in /back
 2021-01-06 09:57:45 +01:00
dependabot[bot] eb56e05e1d
Bump systeminformation from 4.30.5 to 4.31.1 in /back 
Bumps [systeminformation](https://github.com/sebhildebrandt/systeminformation) from 4.30.5 to 4.31.1.
- [Release notes](https://github.com/sebhildebrandt/systeminformation/releases)
- [Changelog](https://github.com/sebhildebrandt/systeminformation/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sebhildebrandt/systeminformation/compare/v4.30.5...v4.31.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-01-06 08:19:02 +00:00
David Négrier a9bef547c5
Merge pull request #554 from thecodingmachine/dependabot/npm_and_yarn/front/axios-0.21.1 
Bump axios from 0.20.0 to 0.21.1 in /front
 2021-01-06 09:18:08 +01:00
Thomas Basler e3f539ca8e Fix: Firefox doesn't show the webcam permission dialogue 2021-01-06 04:01:25 +01:00
Thomas Basler 4242abcc52 Added button to show the copyright info of the map 2021-01-06 02:27:48 +01:00
dependabot[bot] c7ed0bf8bb
Bump axios from 0.20.0 to 0.21.1 in /front 
Bumps [axios](https://github.com/axios/axios) from 0.20.0 to 0.21.1.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v0.21.1/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.20.0...v0.21.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-01-05 23:50:25 +00:00
Thomas Basler 08280afb9b Replaced favicon by binary kitchen 2021-01-05 22:18:04 +01:00
Thomas Basler 51849bee4e Removed ugly cursor images 2021-01-05 21:50:56 +01:00
Thomas Basler be2a8eeeff Changed html title 2021-01-05 21:43:39 +01:00
Thomas Basler c1f31c0235 Hide the create map button in the menu 2021-01-05 21:12:58 +01:00
Thomas Basler 030e3b324d Fixed animation by appling another PR 
https://github.com/thecodingmachine/workadventure/pull/443/
 2021-01-05 21:04:57 +01:00
Thomas Basler 7797df539f Fixed syntax error and commited yarn.lock 2021-01-05 19:13:34 +01:00
Kharhamel a270b6260a
Merge pull request #552 from thecodingmachine/level3URllink 
HOTFIX: Allow exitUrl relative links to rewrite map domain and map instance
 2021-01-05 19:12:17 +01:00
Thomas Basler 88a5fe4664 Added animation function as in PR 
https://github.com/thecodingmachine/workadventure/pull/542
 2021-01-05 18:59:51 +01:00
kharhamel 6caa0e5b62 HOTFIX: the map property exitUrl now accept relative links that are deep enough to rewrite the base url 2021-01-05 18:23:17 +01:00
Thomas Basler 378ae0fe01 Deliver frontend using nginx and generate static files 2021-01-05 18:02:18 +01:00
David Négrier dea7d6dba7
Merge pull request #541 from Informatic/feature/map-sounds 
[rC3] front: implement map sounds
 2021-01-05 13:42:50 +01:00
David Négrier a4743d5ba4
Merge pull request #546 from Mewp/pusher-configurable-port 
Add a PUSHER_HTTP_PORT configuration variable.
 2021-01-05 11:53:37 +01:00
Mewp 4be009d5a1 Add a PUSHER_HTTP_PORT configuration variable. 
Some deployments might not be based on docker, and not on separate
hosts. In such cases, it would be useful to be able to configure the
port pusher listens on.
 2021-01-04 18:23:33 +01:00
David Négrier 359fa3a571
Merge pull request #545 from thecodingmachine/develop 
Release 2021-01-04
 2021-01-04 18:13:53 +01:00
David Négrier e02e051f91
Merge pull request #544 from thecodingmachine/updateMenu 
Update menu design
 2021-01-04 18:10:27 +01:00
Gregoire Parant ac92cbc8f7 Crate share menu and fix menu design 2021-01-04 17:13:41 +01:00
Piotr Dobrowolski 28d687e338 front: implement map sounds 2021-01-04 16:57:31 +01:00
David Négrier cc805f5086
Merge pull request #507 from thecodingmachine/develop 
Release 2020-12-18
 2021-01-04 14:35:17 +01:00
Kharhamel 284846e8a5
Merge pull request #519 from Palid/patch-1 
Fix CustomizeScene killing CPU
 2020-12-29 15:17:42 +01:00
David Négrier 6a2b583ca5
Merge pull request #512 from thecodingmachine/doctilelayerformat 
Improving doc: the tile layer format must be CSV
 2020-12-29 10:15:50 +01:00
Dariusz Niemczyk 640d994dda
Properly fix the CustomizeScene by limiting input 
When left/right arrow is being held on chrome the Phaser gets into infinite rendering loop that doesn't crash the browser but makes it slow to a crawl.
 2020-12-27 11:00:23 +01:00
Dariusz Niemczyk c9250c08f3
Fix CustomizeScene killing CPU 
Fixes #518
 2020-12-27 10:47:56 +01:00
David Négrier 76dee71a5f Improving doc: the tile layer format must be CSV 2020-12-20 22:31:06 +01:00
David Négrier 7bbfa16ca2 Merge branch 'master' of github.com:thecodingmachine/workadventure into develop 2020-12-18 17:16:47 +01:00
David Négrier b4dc73973e
Merge pull request #510 from thecodingmachine/fixcd 
Switching to deeployer-action to speed up and fix CD
 2020-12-18 17:15:54 +01:00
David Négrier a5b5007908 Switching to deeployer-action to speed up CD 2020-12-18 17:04:31 +01:00
David Négrier e5138e1c03
Merge pull request #505 from thecodingmachine/fixFrameLocalStorage 
Manage Local Storage customers player error
 2020-12-18 16:33:36 +01:00