Commit Graph

873 Commits

Author SHA1 Message Date
David Négrier
6b970adc6c Merge branch 'develop' of github.com:thecodingmachine/workadventure into outline
# Conflicts:
#	front/src/Phaser/Game/GameScene.ts
#	front/src/Phaser/Player/Player.ts
#	front/src/index.ts
#	front/yarn.lock
2020-08-17 22:51:37 +02:00
David Négrier
e1989c1c21
Merge pull request #238 from moufmouf/layoutmanager
Adding LayoutManager to position videos according to chosen layout / importance
2020-08-17 22:08:41 +02:00
David Négrier
fc78249eae Code cleanup 2020-08-17 22:03:08 +02:00
David Négrier
0f305b0c12 CSS cleanup 2020-08-17 21:59:26 +02:00
David Négrier
beb0d1ef0a Linter fix 2020-08-17 16:18:39 +02:00
David Négrier
6516e621b0 Adding display / hide of layout buttons when a meet start / ends 2020-08-17 16:12:53 +02:00
David Négrier
7fe2cc19c3 Adding buttons to switch mode 2020-08-17 15:20:03 +02:00
David Négrier
05ca8c813e Fixing chat mode canceling flex display 2020-08-16 23:49:31 +02:00
David Négrier
1509777945 Improving video CSS (work on overlay) 2020-08-16 23:45:03 +02:00
David Négrier
88c099fc13 Improving layout
Fixing left-right switch on all cameras (except current player camera)
2020-08-16 23:19:04 +02:00
David Négrier
0041e088a4 Fixing position of self webcam in CoWebsite mode 2020-08-13 18:28:22 +02:00
David Négrier
9f6c6e0ce1 Adding CoWebsiteManager + first working version of flex video 2020-08-13 18:21:48 +02:00
David Négrier
83fe024c45 Adjusting class in chat mode based on number of divs displayed. 2020-08-11 22:40:54 +02:00
David Négrier
7232bbaef9 Adding LayoutManager to position videos as cleverly as possible 2020-08-11 22:32:55 +02:00
David Négrier
4b940a571c
Merge pull request #237 from moufmouf/definitely_assigned
Switching to definitely assigned parameters
2020-08-09 16:38:12 +02:00
David Négrier
24fb605f50 Switching to definitely assigned parameters
This allows us to go in "full strict mode" (yeah!)
See https://www.typescriptlang.org/docs/handbook/release-notes/typescript-2-7.html#strict-class-initialization
2020-08-07 23:39:06 +02:00
David Négrier
5970bbc76e
Merge pull request #232 from thecodingmachine/develop
Adding customize scene in production
2020-07-29 17:43:15 +02:00
David Négrier
c6298b2a89
Merge pull request #231 from thecodingmachine/customize-characters2
Fixing problem when switching scenes with container
2020-07-29 11:52:21 +02:00
David Négrier
bc929615d1 Fixing problem when switching scenes with container 2020-07-29 11:42:18 +02:00
David Négrier
dcbe8d35db Upgrading dependencies 2020-07-29 11:35:59 +02:00
David Négrier
7248c26313
Merge pull request #230 from thecodingmachine/customize-characters2
png files + customizeScene that enables the player to create his own character
2020-07-28 18:01:29 +02:00
David Négrier
84529d6e99 Propagating customized sprites all over the game 2020-07-28 17:45:55 +02:00
David Négrier
6d0bccc0e1 Making a nice "customize" button 2020-07-28 15:53:44 +02:00
David Perez
866985326b Fixing merge issue 2020-07-28 11:35:30 +02:00
David Perez
90c56ca683 merge 2020-07-28 11:29:21 +02:00
David Perez
25abcfe202 png files 2020-07-28 11:25:19 +02:00
David Perez
21d2a7939b custome characters 2020-07-28 11:24:34 +02:00
David Négrier
2d818ec79d Fixing broken Jasmine test due to module config 2020-07-27 22:48:04 +02:00
David Négrier
ee612f6585 Adding event support to items 2020-07-27 22:36:58 +02:00
David Négrier
513244ae1f Enabling header module on Apache maps container 2020-07-23 19:04:33 +02:00
David Négrier
d48d5b0285 Fix CS 2020-07-23 18:47:28 +02:00
David Négrier
2484e4f1df Moving maps to their own container 2020-07-23 18:43:51 +02:00
David Négrier
ed146226cf Adding Outline capabilities and a ActionableItem notion. 2020-07-23 18:09:24 +02:00
David Négrier
f7466994c5 Playing with pipeline to display outline 2020-07-15 23:44:01 +02:00
David Négrier
f6f90eea32
Merge pull request #225 from thecodingmachine/develop
Putting 404 page in production
2020-07-07 23:05:57 +02:00
David Négrier
a80a4a051a
Merge pull request #224 from thecodingmachine/scene404
Adding a 404 page when resources loading fails
2020-07-07 22:59:17 +02:00
David Négrier
6879418098 Adding a 404 page when resources loading fails 2020-07-07 22:52:22 +02:00
David Négrier
0cd03755c2
Merge pull request #223 from thecodingmachine/develop
Deploy tileset key fix to prod
2020-07-07 18:32:27 +02:00
David Négrier
24c2de94ef
Merge pull request #222 from thecodingmachine/fix_tileset_key
Fixing image tileset key
2020-07-07 18:31:41 +02:00
David Négrier
55767f2c78 Fixing image tileset key
If 2 maps share the same tileset name (even if they use 2 different URLs for the tileset), the tileset image will be reused wrongly.

This commit fixes the tileset key to make it equal to the image URL.
2020-07-07 18:22:10 +02:00
David Négrier
9660db6665
Merge pull request #220 from thecodingmachine/develop
Deploy create your map website page in prod
2020-07-05 19:19:01 +02:00
David Négrier
8f895fb50a
Merge pull request #219 from thecodingmachine/createyourmapdoc
Adding documentation page regarding editing your own map
2020-07-05 19:16:29 +02:00
David Négrier
5a56604038 Adding documentation page regarding editing your own map
This commit adds a new documentation page to the website explaining how to create your own map.
2020-07-05 19:08:37 +02:00
David Négrier
89007e7a30
Merge pull request #218 from thecodingmachine/develop
Deploy to prod
2020-07-05 17:20:56 +02:00
David Négrier
b01958107b
Merge pull request #217 from thecodingmachine/webpackprod
Fixing loading of tilesets with margin or padding
2020-07-05 17:12:49 +02:00
David Négrier
67e07c04f8 Fixing loading of tilesets with margin or padding 2020-07-05 17:10:08 +02:00
David Négrier
bcd0b5c485
Merge pull request #215 from thecodingmachine/webpackprod
Sending the source map out of the main JS file to reduce size
2020-07-02 11:04:55 +02:00
David Négrier
2b5d3e0017 Sending the source map out of the main JS file to reduce size 2020-07-02 10:38:36 +02:00
David Négrier
2eaba04f35
Merge pull request #212 from thecodingmachine/mitigateworlderror
Adding finally clause to make sure Prometheus indicators are ok
2020-06-29 23:05:39 +02:00
David Négrier
82c57810a2 Removing host label from Prometheus because it is redundant 2020-06-29 23:01:52 +02:00