lbehm/workadventure
1
0
Fork 0
Code Issues Pull requests Releases Activity
2028 commits 21 branches 1 tag 50 MiB
Commit graph

650 commits

Author SHA1 Message Date
Johannes Berthel e5a196a42b implemented feedback 2021-04-06 18:54:45 +02:00
Johannes Berthel 7c6b73efdb don't show companion selection during first connexion flow 2021-04-06 18:36:46 +02:00
Johannes Berthel 6c512fb7cd fixed linting 2021-04-03 00:18:08 +02:00
Johannes Berthel 8c35860f2a show select companion scene after customize scene 2021-04-02 23:49:25 +02:00
Johannes Berthel 3187520e7b companion behaviour fine tuning 2021-04-02 23:36:06 +02:00
Johannes Berthel 38c06ce8ff navigate from select character scene to select companion scene 2021-04-02 23:17:04 +02:00
Johannes Berthel 6ee4889773 added change companion button to menu 2021-04-02 23:13:03 +02:00
Johannes Berthel 52303c0bd6 added select companion scene 2021-04-02 23:00:51 +02:00
Johannes Berthel 4cfce15695 only remove listener if scene was not already destroyed 2021-04-02 21:29:45 +02:00
Johannes Berthel e4d324e5fa removed unused import 2021-04-02 21:26:42 +02:00
Johannes Berthel fc3a503bcf don't fail if companion texture is not found 2021-04-02 21:26:24 +02:00
Johannes Berthel c07079051a transmit companion to remote players 2021-04-02 21:21:11 +02:00
Johannes Berthel 2ad712807b add companion only on local player 2021-04-02 17:14:34 +02:00
Johannes Berthel 5a91e15580 add companion to remote player 2021-04-01 18:51:51 +02:00
Johannes Berthel 80a5d2e30e added random companion to player 2021-04-01 00:33:05 +02:00
David Négrier dd0d1fa49f
Merge pull request #854 from thecodingmachine/loadhttpsmapsfromhttp 
Allow loading https maps from http protocol
 2021-03-30 17:57:38 +02:00
David Négrier a68cf38cdc
Merge pull request #856 from thecodingmachine/alonemode 
Adding an "alone" mode
 2021-03-30 17:56:19 +02:00
David Négrier 02fb42b68a
Merge pull request #790 from thecodingmachine/iframe_api 
Adding an API for inter-iframe communication
 2021-03-30 16:31:30 +02:00
David Négrier 559e15ebb6 Adding an "alone" mode 
In "alone" mode (or single-player mode), WorkAdventure does not connect to the server at all.
In order to enter the "alone" mode, you need to add "?alone=true" to the URL.

"alone" mode can be useful for tutorials (First Time User Experience) where you want to explain how WorkAdventure works without being disturbed by other users.
 2021-03-30 16:08:49 +02:00
David Négrier b6edefbe4e Allow loading https maps from http protocol 
In a development environment, we often run in HTTP.
The problem is that WorkAdventure will attempt to load maps using the HTTP protocol (even if the map is on a remote server that is available only in HTTPS).
This commit adds a "fallback". If we are in HTTP (so in a development environment) and if the map fails to load correctly, we will try again, but in HTTPS.

This allows development environment to load maps hosted on a HTTPS enabled server easily.
 2021-03-28 18:35:01 +02:00
David Négrier 8b90a14c39 Fix import 2021-03-28 17:07:00 +02:00
David Négrier aaaa192b71 Merge branch 'develop' of github.com:thecodingmachine/workadventure into iframe_api 
# Conflicts:
#	front/dist/.gitignore
#	front/dist/index.tmpl.html
#	front/src/Phaser/Game/GameScene.ts
#	front/src/WebRtc/CoWebsiteManager.ts
 2021-03-28 16:53:15 +02:00
David Négrier 98aa94bb12 Minor changes 2021-03-28 16:36:02 +02:00
Johannes Berthel 5375528d7c use map tilewidth instead of hardcoded values 2021-03-27 13:57:50 +01:00
kharhamel 886daebfea improved the unloading process to not create a useless socket 2021-03-26 14:19:37 +01:00
kharhamel 99e6743c01 FIX: resizing on wide screen on chrome now use the correct coordinates 2021-03-25 14:35:51 +01:00
kharhamel 0b352fc5dc FIX: help camera settings popup now only show up once 2021-03-24 15:59:18 +01:00
Kharhamel ec2fa9501c
Merge pull request #813 from thecodingmachine/warningMessage 
Warning message
 2021-03-24 14:27:13 +01:00
kharhamel 8d6c1a50bf FEATURE: warning message when world is near full capacity 2021-03-23 17:44:47 +01:00
DESKTOP-FMM8UI0\CLV e05c25a857 replace let for const for variables non reassigned 2021-03-23 17:15:22 +01:00
Kharhamel 7765775df5
Merge pull request #825 from workadventure-xce/audio_player_improvements 
Audio player improvements
 2021-03-23 14:07:20 +01:00
PizZaKatZe 599fdd6ceb Fix group icons and audio attenuation 2021-03-22 20:09:11 +01:00
PizZaKatZe 5bd6f49846 Fix (now legacy) 'playAudioLoop' property 2021-03-22 20:09:11 +01:00
PizZaKatZe fdbcd98a9a Implement audio volume and loop properties 2021-03-22 20:09:11 +01:00
David Négrier f9a2097bc9
Merge pull request #828 from thecodingmachine/develop 
Deploy 2021-03-22
 2021-03-22 16:42:28 +01:00
DESKTOP-FMM8UI0\CLV 3ef3561b57 no message 2021-03-22 16:10:21 +01:00
PizZaKatZe 13fcda7bcf Remove scroll bars 2021-03-21 12:55:14 +01:00
GRL e50c8bc354 Suppression of *{...} in every HTML files because the style.ccs file already declare it. 
Suppression unused code
 2021-03-19 16:21:35 +01:00
GRL 1cfb22f695 Creation of the HelpCameraSettingsScene 
Update of GameManager and index to include the new scene
Change title of helpCameraSettings
Suppression function reset
 2021-03-19 15:40:07 +01:00
GRL 0b00055eda Use includes instead of indexOf 2021-03-19 14:40:18 +01:00
GRL c654f722e3 Add Firefox image 
Check permissions in the game
Button Continue to continue without allowing camera and microphone
 2021-03-19 12:04:37 +01:00
Gregoire Parant d68406d5e1 Create input need page 2021-03-19 12:02:42 +01:00
David Négrier ffb5823b2a Adding the ability to specify a custom Jitsi URL directly in the map 
This feature allows to add a "jitsiUrl" property in the map.
As a result, you can use for a given Jitsi room a custom instance of Jitsi.
Using "jitsiUrl" will only work with public Jitsi instances (authentication is not supported when "jitsiUrl" property is provided)

The Jitsi external_api.js script is now lazily loaded.
 2021-03-16 20:37:12 +01:00
DESKTOP-FMM8UI0\CLV 662134498c Merge branch 'iframe_api' of https://github.com/thecodingmachine/workadventure into FTUEPopup 
# Conflicts:
#	front/src/Phaser/Game/GameScene.ts
 2021-03-12 17:06:42 +01:00
David Négrier 086b88b09a Merge branch 'develop' of github.com:thecodingmachine/workadventure into iframe_api 2021-03-12 18:02:02 +01:00
DESKTOP-FMM8UI0\CLV c5c8770a60 Add First Version of Tuto 
PopUp
Player Control disable
Fake bubble displayed
 2021-03-12 16:39:29 +01:00
kharhamel fe8c75610d FIX: player anims correctly stop on the idle frame 2021-03-11 16:21:02 +01:00
DESKTOP-FMM8UI0\CLV fa4d917729 Resolve conflit with GameScene.ts 2021-03-11 16:03:39 +01:00
Gregoire Parant 2fcb8a76b1 Merge branch 'master' into develop 
# Conflicts:
#	front/src/Connexion/RoomConnection.ts
#	front/src/Phaser/Menu/ReportMenu.ts
 2021-03-11 02:22:05 +01:00
Gregoire Parant 2cf99df2da Hot Fix report 2021-03-11 02:03:06 +01:00
DESKTOP-FMM8UI0\CLV f9f618094d adding error log if name of square in Tile not matching with the param targetObject of OpenPopup in script.js 2021-03-10 17:22:39 +01:00
DESKTOP-FMM8UI0\CLV 8d0411e8a3 can manage position and width/height of a popUp using a square in Tiled 2021-03-10 09:23:45 +01:00
DESKTOP-FMM8UI0\CLV 5e4940dba6 Merge branch 'iframe_api' of https://github.com/thecodingmachine/workadventure into FTUEPopup 
* 'iframe_api' of https://github.com/thecodingmachine/workadventure:
  Removing closeOnClick as it is not implemented
  Adding a Popup object with a close() method on it.
 2021-03-10 09:00:47 +01:00
DESKTOP-FMM8UI0\CLV f7f8be24bc Set Position of the popUp with pos of an object in floorLayer object group 2021-03-10 08:57:49 +01:00
David Négrier bb8b222c22 Adding a Popup object with a close() method on it. 2021-03-09 18:51:30 +01:00
David Négrier 18464e4942 Adding button clicked handling 2021-03-09 18:05:07 +01:00
Kharhamel 21cc842c33
Merge pull request #793 from thecodingmachine/adminWorldsLimit 
FEATURE: the connexion error an user can get when a world is full is now correctly treated.
 2021-03-09 17:45:43 +01:00
DESKTOP-FMM8UI0\CLV 4545de8af1 Merge branch 'iframe_api' of https://github.com/thecodingmachine/workadventure into FTUEPopup 
* 'iframe_api' of https://github.com/thecodingmachine/workadventure:
  Adding button clicked handling

# Conflicts:
#	front/src/Phaser/Game/GameScene.ts
 2021-03-09 17:12:28 +01:00
DESKTOP-FMM8UI0\CLV d29e0819f4 Get position of an object in Tile to set popUp Position 2021-03-09 17:07:14 +01:00
kharhamel 8abc34c631 FEATURE: the connexion error an user can get when a world is full is now correctly traited. Also remove a redundant adminApi call 2021-03-09 16:34:19 +01:00
David Négrier 1e002f93ed Implementation of openPopup script method (WIP) 2021-03-09 16:21:14 +01:00
David Négrier ed2ce68f37 Merge branch 'FTUEPopup' of github.com:ClementVieilly75/workadventure into iframe_api 
# Conflicts:
#	front/dist/.gitignore
#	front/src/Phaser/Game/GameScene.ts
 2021-03-09 15:35:51 +01:00
DESKTOP-FMM8UI0\CLV b175b7164d Merge branch 'develop' of https://github.com/thecodingmachine/workadventure into FTUEPopup 
* 'develop' of https://github.com/thecodingmachine/workadventure:
  Trying to enable back connection on admin from develop, knowing that the develop certificate is broken. Fixing priority.
  Trying to enable back connection on admin from develop, knowing that the develop certificate is broken
  Revert "Adding back admin in develop branch CI"
  Adding back admin in develop branch CI
  Fixing GA tag not included in play domain
  FEATURE: better implementation of the admin global message
  Fix ci
  Update private access
  Allow URLs relative to map base in iframe / openWebsite

# Conflicts:
#	front/src/Phaser/Game/GameScene.ts
 2021-03-09 13:57:05 +01:00
DESKTOP-FMM8UI0\CLV afac042706 supp debug log 2021-03-09 13:53:46 +01:00
David Négrier 2bef328d8a Adding the abaility to track users entering/leaving a zone in the script language. 2021-03-08 18:58:38 +01:00
DESKTOP-FMM8UI0\CLV 858bf0b384 Adding property tile "inGameConsoleMessage", open a popup when user walk on a tile with this property 
Adding map "Tuto2", the FTUE map
 2021-03-08 09:28:15 +01:00
David Négrier 6fbf165c91 Adding the ability to register a single script using the "script" attribute at the map property level. 2021-03-07 21:02:38 +01:00
David Négrier 7d67f55012 Improving security: only iframes opened with "openWebsiteAllowApi" property are now able to send/receive messages. 2021-03-06 16:00:07 +01:00
David Négrier bf8e8bf777
Merge pull request #689 from znerol-forks/feature/cowebsite-load-map-relative-url 
Allow URLs relative to map base in iframe / openWebsite
 2021-03-04 18:21:48 +01:00
kharhamel ad7e16c33b FEATURE: better implementation of the admin global message 2021-03-04 16:18:06 +01:00
Lukas Bachschwell 2772d72eba
Fix report userId in report menu 
Signed-off-by: Lukas Bachschwell <lukas@lbsfilm.at>
 2021-02-24 21:32:16 +01:00
grégoire parant b5514e6e48
Merge pull request #759 from thecodingmachine/jitsiConfig 
Fix last properties changed after trigger change position
 2021-02-18 11:37:41 +01:00
Gregoire Parant 772c3174be Fix last properties changed after trigger change position 2021-02-18 11:32:37 +01:00
Gregoire Parant fff0cbc3f6 Revert message exit 2021-02-17 19:40:00 +01:00
Gregoire Parant 9b7b3eb140 Update feedback @tabascoeye 2021-02-17 19:31:05 +01:00
Gregoire Parant ce423c9fec Remove exit trigger action 2021-02-17 19:29:59 +01:00
Gregoire Parant 83fc7d0cc0 Merge branch 'develop' into exitTriggerAction 
# Conflicts:
#	front/src/Phaser/Game/GameScene.ts
 2021-02-17 19:28:41 +01:00
David Négrier ae1d00c828
Merge pull request #736 from MisterErwin/patch-1 
Fix offsets of SpeechBubble.ts
 2021-02-16 20:02:03 +01:00
znerol 9670f92a08 Allow URLs relative to map base in iframe / openWebsite 2021-02-16 10:53:50 +01:00
MisterErwin aff4c8d145
Do not change rooms if scene failed to load 
Sometimes a following room fails to load (e.g., #582) and instead of fading to black (as no scene is active) when trying to enter that next room, the player will stay in the old room and an error is logged (as throwing one crashes the game).
 2021-02-13 14:15:09 +01:00
MisterErwin 511cd99e22
Fix offsets of SpeechBubble.ts 
Since some recent optimizations, they are being added on top of the player, which makes the offset redundant.
 2021-02-13 14:04:28 +01:00
kharhamel 0c892e0243 FEATURE: implemented a client side blacklist 2021-02-12 19:15:24 +01:00
Gregoire Parant b92b7304b0 Fix to use clear All Keys 2021-02-11 21:48:24 +01:00
David Négrier 91fddd6893 Slugifies the Jitsi room name 
This will avoid Jitsi breaking on unexpected characters and displaying a HTTP 404 error.
 2021-02-10 13:51:17 +01:00
David Négrier f6e93da48a Fixing loading logo being displayed when nothing was loaded 2021-02-10 12:08:16 +01:00
David Négrier a5bdf68246 Moving property reading inside startJitsi (startJitsi is called at 2 different places) 2021-02-10 11:08:57 +01:00
Mickael Chimansky 5cb9624b0b fixup! Jitsi config properties 2021-02-09 20:31:49 +01:00
Mickael Chimansky 9c4d0aa32f Jitsi config properties 2021-02-09 16:05:21 +01:00
David Négrier adb535d1b6
Merge pull request #703 from thecodingmachine/socialNetworkLink 
Social network link anonymous connexion
 2021-02-04 16:10:25 +01:00
Gregoire Parant 03f1f5bf75 Update feedback @moufmouf 2021-02-04 16:05:05 +01:00
Gregoire Parant 59b4b168e9 Social network link anonymous connexion 
In menu, add social newtork link when user is connected in anonymous mode
 2021-02-03 23:14:31 +01:00
Gregoire Parant 4de9b8ba40 Fix icon discussion 
- Fix size of discussion icon
- Update x and y when page is resize
- Fix blanc link in chat
 2021-02-03 23:11:33 +01:00
grégoire parant c41c058fb0
Merge pull request #527 from oliverlorenz/feature/iframe-feature-policy 
feat: adds property openWebsitePolicy property to set "allow" property in iframe
 2021-02-03 17:38:35 +01:00
grégoire parant f2b9f6c92a
Merge pull request #686 from thecodingmachine/publicReportedUser 
Permit puiblic report
 2021-02-02 18:09:25 +01:00
David Négrier 3f274df813 Redesigning loading bar 2021-02-02 17:17:00 +01:00
Gregoire Parant 788e22e8b0 Fix loading logo of WorkAdventure 2021-02-01 16:52:28 +01:00
Gregoire Parant f99db4856f Add WorkAdventure logo 2021-01-30 20:33:31 +01:00
Gregoire Parant 7eb38fae83 Permit puiblic report 
- Create report html
 - Add report flag
 2021-01-29 21:09:10 +01:00
David Négrier 2f01677849
Merge pull request #681 from thecodingmachine/downgradephaser3.24 
Downgraded phaser version to 3.24.1
 2021-01-28 23:08:47 +01:00
kharhamel f2c3d6f158 downgraded phaser version to 3.24.1 2021-01-28 23:03:06 +01:00
David Négrier ce56a5cba1
Revert "downgraded phaser version to 3.22" 2021-01-28 22:38:20 +01:00
kharhamel e7120317c1 downgraded phaser version to 3.22 2021-01-28 19:15:34 +01:00
Kharhamel 9849e70613
Merge pull request #670 from thecodingmachine/httpCypress 
Removed cypress from the project
 2021-01-28 15:03:12 +01:00
kharhamel ca231eee4a remove cypress from the project :( 2021-01-28 14:56:24 +01:00
David Négrier 8eebed1829 Removing pipeline related code 
This code is broken since Phaser 3.50 and we are facing weird issues with MacOS memory leaks and crashes.
Removing this code will remove one potential suspect.
 2021-01-27 11:18:07 +01:00
grégoire parant 86f1099247
Merge pull request #648 from thecodingmachine/customCharacterLadyLoading 
Fix custom character lazy loading
 2021-01-26 15:27:46 +01:00
Gregoire Parant 45b355f780 Refactor lazy loading 2021-01-26 15:21:23 +01:00
Gregoire Parant 1dd2858424 Fix feadback @Kharhamel 2021-01-26 14:04:42 +01:00
Gregoire Parant e2695c58af Verify existing texture 2021-01-26 09:16:39 +01:00
Gregoire Parant 803be36def Merge branch 'develop' into customCharacterLadyLoading 2021-01-26 09:02:17 +01:00
Gregoire Parant c6903cc4c5 Use Error scene and add banned message 2021-01-26 08:57:10 +01:00
Gregoire Parant 8de05c39c1 Lock user when he was banned 2021-01-25 14:10:16 +01:00
Gregoire Parant beb53df364 Error problem open new map 2021-01-25 13:18:57 +01:00
Gregoire Parant 5f88a1a0b9 Exit trigger action 
- [x] Add trigger message custom
- [x] Add trigger for exit map
- [x] Update documentation
 2021-01-25 12:21:40 +01:00
Kharhamel 39194b5531
Merge pull request #642 from tabascoeye/patch-1 
cleanup when closing the scene
 2021-01-25 10:35:01 +01:00
Kharhamel d32fca9777
Merge pull request #597 from psy/feature_streams 
add remote files and streams to playAudio
 2021-01-25 10:33:43 +01:00
Gregoire Parant 232ac6d5d1 Error lazy loading 
Update loader custom characters
 2021-01-24 18:00:30 +01:00
Gregoire Parant 75d8d46c62 clean 2021-01-24 16:02:10 +01:00
Gregoire Parant d93a8da828 Fix custom character lazy loading 2021-01-24 15:57:47 +01:00
TabascoEye 39b433eef5
Update GameScene.ts 
stop all the map specific stuff (Jitsi, coWebsite, Audio) when leaving the scene
Fixes #633
 2021-01-23 01:16:13 +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 65d2c3dfb0 Disabling explicit any check on error handling 2021-01-18 15:36:02 +01:00
Gregoire Parant 679dbd4215 Fix focus cam on select cam scene 2021-01-18 10:40:13 +01:00
David Négrier 4234b38910 Better error message in case of 404 2021-01-17 22:40:54 +01:00
David Négrier adca51f6de Replacing FourOFourScene with more generic ErrorScene 2021-01-17 20:42:45 +01:00
kharhamel fd29826556 fixed a crash linked to incorrect textureDescriptors 2021-01-14 14:47:02 +01:00
psy 8d67947bc1 move map url to else case 2021-01-14 11:48:06 +01:00
psy f431e769cc add remote files and streams to playAudio 2021-01-14 11:45:14 +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
Gregoire Parant 993c58cf8e Fix select rectangle for customize scene 2021-01-12 19:49:48 +01:00
Gregoire Parant 987c80c9c4 Fix menu 2021-01-12 19:48:48 +01:00
Gregoire Parant 123ee4bc43 Fix responsive and limite select cursor 2021-01-12 15:29:26 +01:00
Gregoire Parant f8d4b696e8 Customise characters with admin console 
- Add new characters choise
 - Display on 3 line of 6 pers
 - Add custom characters from admin console wilth level -1
 2021-01-12 13:19:51 +01:00
kharhamel 472fbb1de0 All player textures are now lazy-loaded 2021-01-08 11:44:41 +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
kharhamel fbb44af369 added a basic loader 2021-01-06 17:08:48 +01:00
kharhamel 1359fbe977 updated phaser to version 3.51 and fixed the BC 2021-01-06 15:00:54 +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 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
Oliver Lorenz 7c89cf0e47 feat: adds property openWebsitePolicy to set allow property in iframe 2020-12-29 23:17:16 +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 e5138e1c03
Merge pull request #505 from thecodingmachine/fixFrameLocalStorage 
Manage Local Storage customers player error
 2020-12-18 16:33:36 +01:00
Gregoire Parant a1fd209578 Fix catch error 2020-12-18 16:30:22 +01:00
David Négrier 36f886aed6 Fixing cat running too fast on reconnect scene because animations were duplicated 2020-12-18 16:08:04 +01:00
David Négrier df114bc1ce Fixing broken reconnection 2020-12-18 15:59:07 +01:00
Gregoire Parant 323fa6abba Create exception error 2020-12-18 14:30:46 +01:00
Gregoire Parant f5dd5efc0e Manage Local Storage customers player error 2020-12-18 13:56:25 +01:00
David Négrier 0984e7eaad Fix linting 2020-12-17 22:35:38 +01:00
Gregoire Parant ed8232b0f5 Fix style menu 2020-12-17 21:58:18 +01:00
Gregoire Parant e77eb6d5be Typo fixes 2020-12-17 18:19:47 +01:00
David Négrier 055131ac66 Typo fixes 2020-12-17 15:20:42 +01:00
Gregoire Parant faf32bfa01 Fix event click listner 2020-12-17 14:16:10 +01:00
Gregoire Parant 2d4193a917 Merge branch 'develop' into notifOutSound 2020-12-17 13:56:21 +01:00
kharhamel 9fbcf0dc12 FIX: spark button open in a new window 2020-12-16 19:02:10 +01:00
Gregoire Parant a2d56ef56a Update admin menu 2020-12-16 18:52:11 +01:00
Gregoire Parant 1a27b7d2ee Update menu 2020-12-16 17:17:31 +01:00
kharhamel eb88db92be FIX: going back a 2nd time to SelectCharacterScene used to crash the game 2020-12-16 15:09:58 +01:00
kharhamel f5e77ad749 FIX: menu flicker 2020-12-16 12:49:34 +01:00
kharhamel de9d6756b4 FIX: going to loginScene or customizeScene and then clicking next bring you back directly to the gameScene 2020-12-15 18:00:04 +01:00
kharhamel 069f2f1cec FEAT: prototype game menu using html elements, better icon for text chat 2020-12-15 16:37:57 +01:00
David Négrier 855b55903b
Merge pull request #440 from psy/develop 
center spawn position in the middle of a tile
 2020-12-11 17:36:10 +01:00
David Négrier 2122014947 Merge branch 'develop' of github.com:thecodingmachine/workadventure into scaling 
# Conflicts:
#	front/src/Phaser/Game/GameScene.ts
 2020-12-11 13:06:10 +01:00
David Négrier 6f2c319785 Merge branch 'master' of github.com:thecodingmachine/workadventure into scaling 
# Conflicts:
#	back/src/Services/SocketManager.ts
#	deeployer.libsonnet
#	docker-compose.yaml
#	front/src/Connexion/RoomConnection.ts
#	front/src/Enum/EnvironmentVariable.ts
#	front/src/Phaser/Game/GameScene.ts
#	front/webpack.config.js
#	pusher/src/Controller/IoSocketController.ts
 2020-12-11 13:00:11 +01:00
Kharhamel 57a59cba8e
Merge pull request #473 from thecodingmachine/master 
hotfixes from master
 2020-12-03 18:48:43 +01:00
David Négrier a19edd4dc1 Fixing reconnection to server on back failure 2020-12-03 16:39:44 +01:00
Kharhamel 95665a28d5
Merge pull request #456 from thecodingmachine/performance 
Performance settings
 2020-12-03 14:33:12 +01:00
kharhamel 1971d26dc0 FIX: couldn't access to an anonymous private map 2020-12-01 19:34:36 +01:00
Kharhamel 5f372e485d
Merge pull request #468 from thecodingmachine/master 
hotfixes from master
 2020-11-30 13:49:35 +01:00
Gregoire Parant 27634a61ee Create menu to set your quality video and game 2020-11-27 16:24:07 +01:00
David Négrier 4c1e566a6c Adding a Pusher container as a middleware/dispatcher between front and back 2020-11-26 17:53:30 +01:00
Kharhamel 17e633ae45
Merge pull request #442 from cbluoss/develop 
Adding more clothing options
 2020-11-26 10:30:54 +01:00
kharhamel 65785240e1 FIX: room id is now pushed to the url 2020-11-25 17:17:48 +01:00
psy f08aec28c0 use tilewidth and tileheight to center spawn position dynamically 2020-11-25 15:58:10 +01:00
yourcoke 8ff24c38b0
added: engelbert hose + mask 2020-11-24 20:23:20 +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
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
Gregoire Parant 26cfae7136 Merge branch 'develop' into firefox-error-jitsi 
# Conflicts:
#	front/src/WebRtc/MediaManager.ts
 2020-11-23 15:46:19 +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
yourcoke bbd3d9efae
added: hoodies 2020-11-21 15:46:04 +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
yourcoke f5e41cc285
added: pride shirt 2020-11-20 15:56:58 +01:00
yourcoke 62f13f6b30
added: mate bottle accessorie 2020-11-20 11:49:08 +01:00
yourcoke a6c8132f0a
added: tinfoil hat1 2020-11-20 10:59:22 +01:00
psy 9e835620f1 center spawn position in the middle of a tile, instead of the upper left corner 2020-11-19 13:19:56 +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
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
Kharhamel eed292b707
Merge pull request #428 from thecodingmachine/master 
Hotfixes from master
 2020-11-17 15:26:11 +01:00
kharhamel b6b76cbfaf FIX: creating an exit to the current map should not cause a crash anymore 2020-11-17 15:02:21 +01:00
Gregoire Parant 1570ef9663 Merge branch 'develop' into windows-focus-blur-camera 
# Conflicts:
#	front/src/Phaser/Game/GameScene.ts
 2020-11-16 15:46:52 +01:00
Gregoire Parant b0bd4c5f40 Merge remote-tracking branch 'github.com/develop' into feature-discussion 2020-11-16 15:43:28 +01:00
David Négrier c7031c7c54
Merge pull request #411 from thecodingmachine/fix-#314 
Fix init position and trigger layers properties
 2020-11-16 15:24:21 +01:00