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

1754 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kharhamel
746f1029a8
Merge pull request #687 from malteriechmann/patch-1 
Run containers in the background using detached mode
 2021-04-29 10:39:47 +02:00
Kharhamel
a984151912
Merge pull request #904 from thecodingmachine/improvetestcases 
Improving test cases
 2021-04-29 10:37:08 +02:00
kharhamel
fe27169745 solved conflict with develop 2021-04-29 10:31:16 +02:00
Kharhamel
398326b3aa
Merge pull request #959 from thecodingmachine/dependabot/npm_and_yarn/front/ssri-6.0.2 
Bump ssri from 6.0.1 to 6.0.2 in /front
 2021-04-29 10:18:33 +02:00
David Négrier
2e4b03efff
Merge pull request #962 from thecodingmachine/bugfix/add_template_to_single_domain 
Adding templater call to single domain startup
 2021-04-29 09:45:16 +02:00
David Négrier
d29dee3bd4 Adding templater call to single domain startup 
The docker-compose.single-domain.yaml was missing a call to the templater script.
As a result, the first run would fail unless docker-compose.yaml was started before.

Closes #947
Closes #957
 2021-04-29 09:42:15 +02:00
grégoire parant
19ae575b4f
HotFix style help modal (#960) 2021-04-29 01:49:09 +02:00
dependabot[bot]
1e42de9155
Bump ssri from 6.0.1 to 6.0.2 in /front 
Bumps [ssri](https://github.com/npm/ssri) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/npm/ssri/releases)
- [Changelog](https://github.com/npm/ssri/blob/v6.0.2/CHANGELOG.md)
- [Commits](https://github.com/npm/ssri/compare/v6.0.1...v6.0.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-28 23:28:10 +00:00
grégoire parant
5c0b5ef74b
HotFix release v1.3.1 (#958) 
- Update camera style support mobile
 - Fix admin console error
 2021-04-29 01:26:09 +02:00
grégoire parant
c2f62e2610
Merge pull request #956 from thecodingmachine/develop 
Release 28/04 v1.3.1
 2021-04-28 00:01:18 +02:00
Gregoire Parant
16397fe978 Merge branch 'master' into develop 2021-04-27 23:59:25 +02:00
grégoire parant
9b69910cb8
WIP: Update style for mobile (#942) 
* Update style for mobile

 - Update style for mobile modale

* Fix overscroll

* Change css properties overflow

* Revert "Change css properties overflow"

This reverts commit 612fcc7e007fb03c7f72e5fa4b8a0604a184ae7d.

* rm image

* Update view mobile

* Fix CI
 2021-04-27 23:58:33 +02:00
GRL78
57194fd0a1
Add maps for test (#915) 2021-04-27 23:45:28 +02:00
Kharhamel
94e564f135
Merge pull request #955 from thecodingmachine/fixCleanup 
FIX: fixed cleanup for real this time
 2021-04-27 18:26:12 +02:00
kharhamel
79701fe227 FIX: fixed cleanup for real this time 2021-04-27 18:18:20 +02:00
Kharhamel
76a21cafa0
Merge pull request #954 from thecodingmachine/restrictCD 
FIX: fixed cleanup workflow
 2021-04-27 17:28:03 +02:00
kharhamel
3ce5c2ec45 FIX: fixed cleanup workflow 2021-04-27 17:17:54 +02:00
Kharhamel
c6ed2c5c57
Merge pull request #953 from thecodingmachine/restrictCD 
FIX: fixed cleanup workflow
 2021-04-27 17:03:45 +02:00
kharhamel
7a8765826e FIX: fixed cleanup workflow 2021-04-27 16:51:57 +02:00
Kharhamel
c19201b636
Merge pull request #952 from thecodingmachine/restrictCD 
edited CD domain in deeployer config
 2021-04-27 16:37:37 +02:00
kharhamel
ea009d912e edited CD domain in deeployer config 2021-04-27 16:30:35 +02:00
Kharhamel
998e051a45
Merge pull request #940 from thecodingmachine/restrictCD 
FIX: the deploy action now only start when the label 'deploy' is applied to the PR
 2021-04-27 15:49:15 +02:00
kharhamel
30cf078df5 FIX: the deploy action now only start when the label 'deploy' is applied to the PR 2021-04-26 18:33:03 +02:00
grégoire parant
4e09246c7f
Merge pull request #939 from thecodingmachine/develop 
Release 26/04/2021
 2021-04-26 13:42:27 +02:00
David Négrier
ca628d9a90
Merge pull request #901 from thecodingmachine/text_display 
Adding the ability to display "Text" objects from Tiled
 2021-04-26 11:30:34 +02:00
David Négrier
08ca95b143 Fixing WorkWrap 2021-04-26 11:28:15 +02:00
David Négrier
22cb41dc29 Adding the ability to display "Text" objects from Tiled 
I honestly don't believe text objects look good on map, and in real maps, I think text should be written on tiles.

However, for a variety of use cases (like in test maps in the /maps/test directory, it can be useful to be
able to display some text easily on a map.

This PR adds the ability to display this text.

Note: the "font" support cannot work correctly, as Tiled is listing fonts from the local
system, and those fonts are not available in a browser.
 2021-04-26 11:28:13 +02:00
David Négrier
e37ab7d8ad
Merge pull request #899 from thecodingmachine/Lurkars/map-group-layer-support 
Map group layer support (2)
 2021-04-26 11:26:21 +02:00
David Négrier
6e5fa2c514 Initiating CHANGELOG file 2021-04-26 11:21:36 +02:00
David Négrier
6815fe7a0a Added a new LayersIterator class 
This class iterates recursively over layers, flattening groups.
This enables us to simplify the code when we iterate layers. We can remove all recursive function calls in the GameScene code (it is delegated to the LayersIterator)
 2021-04-26 11:21:34 +02:00
Lurkars
66b90be0da remove redundancy 2021-04-26 11:20:28 +02:00
Lurkars
93b7b7bc91 removed redundancy, fix for startLayer 2021-04-26 11:20:28 +02:00
Lurkars
9b6be3466b support for group layer of Tiled (excludes 'start' layer) 2021-04-26 11:20:28 +02:00
grégoire parant
f0d277af32
Nickname not centered in video-container (#935) 
* Nickname not centered in video-container

#823
 2021-04-24 15:45:58 +02:00
Gregoire Parant
364c1d3e98 Merge branch 'master' into develop 2021-04-24 10:39:49 +02:00
grégoire parant
61c8830e24
Merge pull request #934 from thecodingmachine/HotFixStyleMessgae 
HotFix Fix style message displaying
 2021-04-24 10:37:33 +02:00
Gregoire Parant
0c72378001 Fix style message displaying 
#926
 2021-04-24 10:36:53 +02:00
grégoire parant
d9620c373f
Merge pull request #918 from thecodingmachine/newStartMobileScene 
Mobile started scene
 2021-04-23 19:51:45 +02:00
Gregoire Parant
b934d3404f Fix feedback WorkAdventure team 2021-04-23 19:29:43 +02:00
David Négrier
4f4f499d47 Making alone mode more robust 
This fixes a number of issues where the game was attempting to access a non existing connection (in alone mode)
 2021-04-23 13:44:04 +02:00
Gregoire Parant
f11e936143 Refactoring & fix feedback WorkAdventure 2021-04-23 03:59:14 +02:00
Gregoire Parant
8e52b8597c Merge branch 'develop' into newStartMobileScene 
# Conflicts:
#	front/src/Phaser/Login/EnableCameraScene.ts
#	front/src/Phaser/Login/LoginScene.ts
#	front/src/Phaser/Login/SelectCharacterScene.ts
#	front/src/Phaser/Login/SelectCompanionScene.ts
 2021-04-22 23:36:21 +02:00
Gregoire Parant
d7f00b505a Update Companion Scene for mobile 2021-04-22 13:10:23 +02:00
Gregoire Parant
3697ddabfa Fix responsive Camera Settings 2021-04-22 11:47:59 +02:00
Gregoire Parant
3df32de83b Update camera and adapte for mobile 2021-04-22 11:26:35 +02:00
Kharhamel
1251cbdc76
Merge pull request #925 from thecodingmachine/touchZones 
FIX: use phaser Zones instead of rectangles objects to create tap zones
 2021-04-22 10:28:28 +02:00
Gregoire Parant
0a04f5d631 Finish select character scene and custom character scene 2021-04-22 02:29:13 +02:00
kharhamel
c8ba3d8ab9 FIX: use phaser Zones instead of rectangles objects to create tap zones 2021-04-21 18:27:33 +02:00
Gregoire Parant
78d888ffaf Update menu mobile 
- Add mobile style share modal
- Add mobile style settings modal
- Add menu mobile style
 2021-04-21 00:53:45 +02:00
Gregoire Parant
20e0a2553e Update cowebsite mobile style 2021-04-20 21:11:05 +02:00