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

1073 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DESKTOP-V1PKLGR\npegu
0d530e18ce Add floor2 and update floor0 and floor1 2020-12-10 19:51:35 +01:00
DESKTOP-V1PKLGR\npegu
eabd1d1b2f Change stairs for floor 0 2020-12-10 08:59:13 +01:00
DESKTOP-V1PKLGR\npegu
958ec51b12 Change map floor 1 Fixes 2020-12-09 23:50:30 +01:00
DESKTOP-V1PKLGR\npegu
7d62d64e17 Change map floor 1 2020-12-09 23:20:13 +01:00
DESKTOP-V1PKLGR\npegu
87519a1ad3 Add Xmas decorations #2 2020-12-09 18:04:52 +01:00
DESKTOP-V1PKLGR\npegu
add584f9a0 Add Wmas decorations 2020-12-08 19:52:27 +01:00
DESKTOP-V1PKLGR\npegu
a7a5990479 Change the information page at the entrance and add inscriptions on the floor 2020-12-07 19:22:25 +01:00
DESKTOP-V1PKLGR\npegu
c897bd192d Fix exit_lyon URL 2020-12-07 14:15:07 +01:00
DESKTOP-V1PKLGR\npegu
da17da9613 Fix some details on collides 2020-12-07 09:19:31 +01:00
DESKTOP-V1PKLGR\npegu
0a415248c0 Change the TCM map to create a new style with more quality 2020-12-07 01:07:46 +01:00
David Négrier
699d5f418a
Merge pull request #472 from thecodingmachine/hotfix/privateAnonymousLogin 
FIX: couldn't access to an anonymous private map
 2020-12-01 19:36:21 +01:00
kharhamel
1971d26dc0 FIX: couldn't access to an anonymous private map 2020-12-01 19:34:36 +01:00
Kharhamel
d36cec23a7
Merge pull request #463 from thecodingmachine/hotfix/timeouts 
Hotfix/timeouts
 2020-11-30 11:43:36 +01:00
kharhamel
28b0229c76 FIX: disabled pingCameraStatus and reduced the amount of errors thrown in console 2020-11-27 17:06:47 +01:00
Kharhamel
5c18f22f1d
Merge pull request #459 from thecodingmachine/hotfix/pushRoomIDToUrl 
FIX: room id is now pushed to the url
 2020-11-25 17:53:45 +01:00
kharhamel
65785240e1 FIX: room id is now pushed to the url 2020-11-25 17:17:48 +01:00
Kharhamel
48b856f836
Merge pull request #455 from thecodingmachine/develop 
deployment
 2020-11-24 18:29:43 +01:00
Kharhamel
4aa4a8d552
Merge pull request #435 from thecodingmachine/fix/rightColumn 
Rewrite the way exit detection work
 2020-11-24 14:51:28 +01:00
kharhamel
540f69267b FIX: maps/dist directory is now gitignored 2020-11-24 14:43:21 +01:00
kharhamel
8d8b879ed6 FIX: the game now uses the url hash to choose the start layer 2020-11-24 14:43:21 +01:00
kharhamel
09d6d22a5d FIX: rewrote the way scene exits are triggered 2020-11-24 14:43:21 +01:00
grégoire parant
c5af6df7fa
Merge pull request #448 from thecodingmachine/report-button 
Report button discussion
 2020-11-23 20:48:52 +01:00
grégoire parant
c3d4c668e2
Merge pull request #384 from thecodingmachine/action-button 
Action button
 2020-11-23 20:44:46 +01:00
Gregoire Parant
b1410b915c Add 'onaction' JitsiTrigger on Jitsi space floor0 2020-11-23 20:44:16 +01:00
Gregoire Parant
3d32fb90dc Add constant 2020-11-23 20:34:05 +01:00
Gregoire Parant
2812387650 Merge branch 'develop' into action-button 2020-11-23 20:08:19 +01:00
grégoire parant
d1f181cc0c
Merge pull request #430 from thecodingmachine/firefox-error-jitsi 
Add close button jitsi frame
 2020-11-23 16:07:02 +01:00
Gregoire Parant
26cfae7136 Merge branch 'develop' into firefox-error-jitsi 
# Conflicts:
#	front/src/WebRtc/MediaManager.ts
 2020-11-23 15:46:19 +01:00
grégoire parant
22217e27be
Merge pull request #429 from thecodingmachine/dependabot/npm_and_yarn/website/dot-prop-4.2.1 
Bump dot-prop from 4.2.0 to 4.2.1 in /website
 2020-11-23 15:40:33 +01:00
grégoire parant
b0c54776b1
Merge pull request #376 from thecodingmachine/windows-focus-blur-camera 
Switch off camera when user is not focused on WorkAdventure windows
 2020-11-23 15:35:45 +01:00
Gregoire Parant
fd3b8dda2c Fix report button on anonymous connection 2020-11-22 12:40:03 +01:00
Gregoire Parant
39cdc3fbd9 Fix trgger stream and update scene record 2020-11-21 18:47:38 +01:00
Gregoire Parant
a6876658ab Merge branch 'develop' into windows-focus-blur-camera 
# Conflicts:
#	front/src/WebRtc/MediaManager.ts
 2020-11-21 15:57:55 +01:00
Gregoire Parant
f656d2edef Update gitignore 2020-11-21 15:41:23 +01:00
Gregoire Parant
3aaeda6f80 Merge branch 'develop' into action-button 
# Conflicts:
#	front/dist/resources/style/style.css
#	front/src/Phaser/Game/GameScene.ts
 2020-11-21 15:40:24 +01:00
Gregoire Parant
92137dc0a3 Merge branch 'master' into develop 2020-11-18 16:57:14 +01:00
Gregoire Parant
c956e27bc8 Add tenue sg 2020-11-18 16:55:58 +01:00
David Négrier
e47ec5dd87
Merge pull request #436 from thecodingmachine/website-typos-changes 
Website typos changes
 2020-11-18 14:23:56 +01:00
kevin
54703c77e4 fix conflicts 2020-11-18 13:04:16 +01:00
kevin
a969e33bee fix email 2020-11-18 12:21:42 +01:00
David Négrier
9db30a44b3
Merge pull request #434 from thecodingmachine/website-typos-changes 
Wording changes
 2020-11-18 09:37:40 +01:00
kevin
55ce1eee03 wording changes 2020-11-18 09:11:28 +01:00
kevin
62a1732e53 wording changes 2020-11-18 08:40:42 +01:00
Gregoire Parant
1bff2addf1 Merge branch 'develop' into firefox-error-jitsi 
# Conflicts:
#	front/src/WebRtc/MediaManager.ts
 2020-11-17 18:54:51 +01:00
David Négrier
73968bab94
Merge pull request #377 from thecodingmachine/feature-discussion 
Feature discussion
 2020-11-17 18:38:09 +01:00
David Négrier
25f6fa7d2a Migrating to rlespinasse/github-slug-action@3.1.0 2020-11-17 18:27:33 +01:00
Gregoire Parant
11def280cb Merge branch 'develop' into feature-discussion 2020-11-17 18:08:53 +01:00
Gregoire Parant
0a7063a478 Add close button 2020-11-17 18:03:44 +01:00
Gregoire Parant
64d00bda56 Add function to show when message received 2020-11-17 16:46:46 +01:00
dependabot[bot]
b8bafe9c7e
Bump dot-prop from 4.2.0 to 4.2.1 in /website 
Bumps [dot-prop](https://github.com/sindresorhus/dot-prop) from 4.2.0 to 4.2.1.
- [Release notes](https://github.com/sindresorhus/dot-prop/releases)
- [Commits](https://github.com/sindresorhus/dot-prop/compare/v4.2.0...v4.2.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-11-17 14:26:58 +00:00