e8127fc4ae
Fix handling of remote maps
2021-01-20 21:00:59 +01:00
84d9e47c73
Undo previous changes regaring index.html template
2021-01-20 20:38:58 +01:00
cfaf7aaf60
Merge remote-tracking branch 'upstream/develop' into develop
2021-01-20 19:41:05 +01:00
David Négrier
84f85effe5
Merge pull request #628 from thecodingmachine/template-analytics
...
Template google analytics data (2)
2021-01-20 18:03:28 +01:00
David Négrier
f87f3889df
Running templater in CI phase
2021-01-20 18:00:11 +01:00
David Négrier
9e469a4a8f
Removing Google Analytics tracking from test environments
2021-01-20 17:30:26 +01:00
David Négrier
15b3e87bd1
Renaming TRACKING_NUMBER to GA_TRACKING_ID
2021-01-20 17:30:11 +01:00
David Négrier
fd89d54ed9
Adding GA tracking in test envs
2021-01-20 16:57:30 +01:00
David Négrier
aa9a21ad4c
Merge pull request #581 from Informatic/fix/firefox-webcam
...
front: fix webrtc webcam feed on Firefox
2021-01-20 16:27:45 +01:00
David Négrier
b03abee481
Fixing admin links
2021-01-20 10:34:34 +01:00
grégoire parant
cb7cf7a141
Merge pull request #625 from thecodingmachine/phaser3.54
...
FEATURE: updated phaser to version 3.52
2021-01-19 18:51:03 +01:00
kharhamel
49531bb8fa
FEATURE: updated phaser to version 3.52
2021-01-19 18:31:58 +01:00
Jean-Philippe Evrard
e2f400472f
Template google analytics data
...
Without this patch, the index.html contains google analytics at
all times, including for people self-hosting it.
This is a problem for privacy reasons, and only people wanting
to have analytics on their instances should be able to enable
them.
This fixes it by making sure the index.html page is templated
to sideload content from ANALYTICS_CODE_PATH (which itself is
also templated, for convenience).
2021-01-19 12:17:05 +01:00
Gregoire Parant
c95419f0e7
Prepar release 1.1.0
...
Automatically redirect on floor0 of TCM map
2021-01-18 22:52:25 +01:00
David Négrier
d891a288b5
Switching to new admin url
2021-01-18 21:02:25 +01:00
David Négrier
1f9d975505
Fixing CI
2021-01-18 19:52:44 +01:00
David Négrier
db1e700488
Merge pull request #618 from thecodingmachine/featureBan
...
Removing website container entirely from project
2021-01-18 19:49:21 +01:00
David Négrier
675c043cb5
Removing website container entirely from project (as it is specific to the WorkAdventure company and not to the WorkAdventure self-installed project)
2021-01-18 19:39:22 +01:00
David Négrier
c466ba8ca5
Merge pull request #601 from thecodingmachine/featureBan
...
Create ban feature by admin console
2021-01-18 19:31:51 +01:00
David Négrier
4df200c6c0
Switching ban by IP to be world specific
2021-01-18 16:41:36 +01:00
Gregoire Parant
5954ded195
Update link for private TCM map
2021-01-18 16:25:44 +01:00
David Négrier
0d4808231a
Linting code
2021-01-18 15:43:27 +01:00
David Négrier
65d2c3dfb0
Disabling explicit any check on error handling
2021-01-18 15:36:02 +01:00
David Négrier
e0fcb38c4f
Fixing CI pipeline
2021-01-18 15:34:22 +01:00
David Négrier
8fcc1534d8
Fixing let/const in Admin
2021-01-18 15:31:19 +01:00
David Négrier
217b04dafa
Adding pusher CI
2021-01-18 15:31:07 +01:00
David Négrier
d1222e4440
Refactoring admin messages
2021-01-18 15:07:40 +01:00
grégoire parant
ddb7e2a12b
Merge pull request #614 from thecodingmachine/fixFocusCamScene
...
Fix focus cam on select cam scene
2021-01-18 10:52:28 +01:00
Gregoire Parant
679dbd4215
Fix focus cam on select cam scene
2021-01-18 10:40:13 +01:00
David Négrier
b1d4af005e
Adding missing use statement
2021-01-17 22:44:22 +01:00
David Négrier
4234b38910
Better error message in case of 404
2021-01-17 22:40:54 +01:00
David Négrier
48c3f951bf
Correctly forwarding HTTP error status code from admin to front
2021-01-17 20:42:45 +01:00
David Négrier
a5aa9b6cf9
/map now returns the correct error status code
2021-01-17 20:42:45 +01:00
David Négrier
adca51f6de
Replacing FourOFourScene with more generic ErrorScene
2021-01-17 20:42:45 +01:00
Gregoire Parant
0bbaef0cb5
Fix send message and ban message
2021-01-17 03:07:46 +01:00
c4b2bd86c2
Added Chaos Communication Continent
2021-01-17 00:34:37 +01:00
Gregoire Parant
74d0594246
Fix feedback @moufmou
2021-01-16 20:14:21 +01:00
Gregoire Parant
a7398fa851
Fix ci
2021-01-15 05:12:23 +01:00
Gregoire Parant
b1f8522c05
Create ban feature by admin console
2021-01-15 03:19:58 +01:00
Gregoire Parant
8c9e9522db
Revert "Update ban feature"
...
This reverts commit d2ee52ce43
2021-01-15 03:15:14 +01:00
Gregoire Parant
d2ee52ce43
Update ban feature
2021-01-15 03:14:15 +01:00
572febea54
Merge remote-tracking branch 'upstream/develop' into develop
2021-01-14 20:21:29 +01:00
Kharhamel
871ee6b192
Merge pull request #596 from thecodingmachine/fixLazyLoadCrash
...
fixed a crash linked to incorrect textureDescriptors
2021-01-14 15:14:25 +01:00
kharhamel
fd29826556
fixed a crash linked to incorrect textureDescriptors
2021-01-14 14:47:02 +01:00
f16c7d9d3c
Merge remote-tracking branch 'upstream/master' into develop
2021-01-13 22:29:22 +01:00
David Négrier
16205bc4c8
Merge pull request #593 from thecodingmachine/develop
...
Deploy 2020-01-13
2021-01-13 19:06:28 +01:00
David Négrier
842eadeb59
Merge pull request #592 from thecodingmachine/fixpipelinenowebgl
...
Fixing bug when no WebGL is available
2021-01-13 18:45:16 +01:00
David Négrier
8cf481ec49
Fixing bug when no WebGL is available
...
The switch to Phaser 3.50 introduced a bug when WebGL is not available in a browser.
The changes in this commit prevent calls to the WebGL pipeline if the pipeline is not available.
2021-01-13 18:39:28 +01:00
grégoire parant
8ffba3157a
Merge pull request #588 from thecodingmachine/customiseCharacters
...
Customise characters with admin console
2021-01-13 16:47:13 +01:00
Gregoire Parant
512be7acd2
New basic characters
2021-01-13 16:46:24 +01:00
