libreadventure.git
4 years agoFixing domain name
David Négrier [Wed, 13 May 2020 14:17:58 +0000 (16:17 +0200)]
Fixing domain name

4 years agoMerge pull request #107 from thecodingmachine/domain_name
David Négrier [Wed, 13 May 2020 14:07:06 +0000 (16:07 +0200)]
Merge pull request #107 from thecodingmachine/domain_name

Deploying master on new workadventu.re domain

4 years agoNot adding comment on push (only pull_request)
David Négrier [Wed, 13 May 2020 13:58:17 +0000 (15:58 +0200)]
Not adding comment on push (only pull_request)

4 years agoDeploying master on new workadventu.re domain
David Négrier [Wed, 13 May 2020 13:31:01 +0000 (15:31 +0200)]
Deploying master on new workadventu.re domain

... but still deploying in the test cluster.

4 years agoMerge pull request #99 from thecodingmachine/map_history
David Négrier [Wed, 13 May 2020 09:03:49 +0000 (11:03 +0200)]
Merge pull request #99 from thecodingmachine/map_history

Adding support for history API

4 years agoMerge pull request #106 from thecodingmachine/up_to_4
David Négrier [Wed, 13 May 2020 07:52:25 +0000 (09:52 +0200)]
Merge pull request #106 from thecodingmachine/up_to_4

Removing limitation to allow up to 4 players in a group

4 years agoRemoving limitation to allow up to 4 players in a group
David Négrier [Wed, 13 May 2020 07:39:48 +0000 (09:39 +0200)]
Removing limitation to allow up to 4 players in a group

4 years agoFixing htaccess redirect
David Négrier [Wed, 13 May 2020 07:29:18 +0000 (09:29 +0200)]
Fixing htaccess redirect

4 years agoRedirecting to the correct map after login screen based on URL provided
David Négrier [Tue, 12 May 2020 22:02:39 +0000 (00:02 +0200)]
Redirecting to the correct map after login screen based on URL provided

4 years agoAdding history support
David Négrier [Mon, 11 May 2020 22:07:50 +0000 (00:07 +0200)]
Adding history support

Arriving on a new map now changes the URL.
All URLs starting with _ are automatically redirected to index.html by the web server

4 years agoRefactoring/centralizing map loading in GameManager
David Négrier [Mon, 11 May 2020 21:26:40 +0000 (23:26 +0200)]
Refactoring/centralizing map loading in GameManager

4 years agoMerge pull request #103 from thecodingmachine/catching_errors
David Négrier [Tue, 12 May 2020 09:58:56 +0000 (11:58 +0200)]
Merge pull request #103 from thecodingmachine/catching_errors

Catching errors in socket callbacks

4 years agoCatching errors in socket callbacks
David Négrier [Tue, 12 May 2020 09:49:55 +0000 (11:49 +0200)]
Catching errors in socket callbacks

Catching errors in socket callbacks to avoid having the server crashing when an error occurs.

4 years agoMinor update layer position in map floor0 and floor1
gparant [Tue, 12 May 2020 00:01:18 +0000 (02:01 +0200)]
Minor update layer position in map floor0 and floor1

4 years agoMerge pull request #98 from thecodingmachine/map-v1
David Négrier [Mon, 11 May 2020 22:40:17 +0000 (00:40 +0200)]
Merge pull request #98 from thecodingmachine/map-v1

Add KEN office to the map

4 years agoFixing exit points
David Négrier [Mon, 11 May 2020 22:38:24 +0000 (00:38 +0200)]
Fixing exit points

4 years agoMerge branch 'master' of github.com:thecodingmachine/workadventure into map-v1
David Négrier [Mon, 11 May 2020 22:24:05 +0000 (00:24 +0200)]
Merge branch 'master' of github.com:thecodingmachine/workadventure into map-v1

# Conflicts:
# back/src/Assets/Maps/Floor0/floor0.json

4 years agoMerge pull request #100 from thecodingmachine/fix/css
grégoire parant [Mon, 11 May 2020 22:23:38 +0000 (00:23 +0200)]
Merge pull request #100 from thecodingmachine/fix/css

Minor Fix css style

4 years agoMinor Fix overflow css style
gparant [Mon, 11 May 2020 22:22:55 +0000 (00:22 +0200)]
Minor Fix overflow css style

4 years agoAdd KEN office to the map
NIP [Mon, 11 May 2020 21:42:10 +0000 (23:42 +0200)]
Add KEN office to the map

4 years agoMerge pull request #93 from thecodingmachine/fix-recette-grp
David Négrier [Mon, 11 May 2020 20:59:22 +0000 (22:59 +0200)]
Merge pull request #93 from thecodingmachine/fix-recette-grp

Fix recette GRP

4 years agoMerge pull request #95 from thecodingmachine/lyon_map
David Négrier [Mon, 11 May 2020 20:56:47 +0000 (22:56 +0200)]
Merge pull request #95 from thecodingmachine/lyon_map

 Refactoring "exit" to allow multiple maps

4 years agoFix depth error in the first floor
gparant [Mon, 11 May 2020 19:16:14 +0000 (21:16 +0200)]
Fix depth error in the first floor

4 years agoFix CI lint
gparant [Mon, 11 May 2020 18:55:17 +0000 (20:55 +0200)]
Fix CI lint

4 years agoFix position layer in map lyon
gparant [Mon, 11 May 2020 18:53:23 +0000 (20:53 +0200)]
Fix position layer in map lyon

4 years agoMerge pull request #97 from moufmouf/fix_player_name_depth
David Négrier [Mon, 11 May 2020 17:27:02 +0000 (19:27 +0200)]
Merge pull request #97 from moufmouf/fix_player_name_depth

Putting player names depth at a high depth to have them always visible

4 years agoFixing typo
David Négrier [Mon, 11 May 2020 17:19:42 +0000 (19:19 +0200)]
Fixing typo

4 years agoPutting player names depth at a high depth to have them always visible
David Négrier [Mon, 11 May 2020 17:16:36 +0000 (19:16 +0200)]
Putting player names depth at a high depth to have them always visible

4 years agoRefactoring "exit" to allow multiple maps
David Négrier [Mon, 11 May 2020 16:49:20 +0000 (18:49 +0200)]
Refactoring "exit" to allow multiple maps

Adding several layers named "exit" causes issues with Phaser 3.
This PR makes any possible layer being an exit layer (it only depends on the exitUrl property)

Also, fixing start position (it takes into account the layer width now)

4 years agouse start and exit layers on map
William [Mon, 11 May 2020 12:00:15 +0000 (14:00 +0200)]
use start and exit layers on map

4 years agoDelete params not used
gparant [Mon, 11 May 2020 11:19:48 +0000 (13:19 +0200)]
Delete params not used

4 years agoFix update world back end and deleting group in front end
gparant [Mon, 11 May 2020 11:17:02 +0000 (13:17 +0200)]
Fix update world back end and deleting group in front end

4 years agoMerge pull request #88 from thecodingmachine/feature/map-floor1
David Négrier [Mon, 11 May 2020 06:57:17 +0000 (08:57 +0200)]
Merge pull request #88 from thecodingmachine/feature/map-floor1

Map 1st floor

4 years agoRewording exit paragraph
David Négrier [Mon, 11 May 2020 06:51:46 +0000 (08:51 +0200)]
Rewording exit paragraph

4 years agoFix exit tile map of floot1
gparant [Sun, 10 May 2020 22:32:37 +0000 (00:32 +0200)]
Fix exit tile map of floot1

4 years agoFix url to get the next map in GameScene
gparant [Sun, 10 May 2020 22:25:06 +0000 (00:25 +0200)]
Fix url to get the next map in GameScene

4 years agoAdd explain to have multi exit layers into the map
gparant [Sun, 10 May 2020 22:07:54 +0000 (00:07 +0200)]
Add explain to have multi exit layers into the map

4 years agoFix error mapping refresh in back & the end of this feature development
gparant [Sun, 10 May 2020 21:49:08 +0000 (23:49 +0200)]
Fix error mapping refresh in back & the end of this feature development

4 years agoRefactor leave and join room
gparant [Sun, 10 May 2020 17:54:41 +0000 (19:54 +0200)]
Refactor leave and join room

4 years agoChange to update world by scene and room id
gparant [Sun, 10 May 2020 17:45:17 +0000 (19:45 +0200)]
Change to update world by scene and room id

4 years agoFix feedback @moufmouf strategy of maps managing by back.
gparant [Sun, 10 May 2020 16:34:55 +0000 (18:34 +0200)]
Fix feedback @moufmouf strategy of maps managing by back.

4 years agoFix feedback @moufmouf on circle texture
gparant [Sun, 10 May 2020 15:55:30 +0000 (17:55 +0200)]
Fix feedback @moufmouf on circle texture

4 years agoRemove middleware to secure access API.
gparant [Sun, 10 May 2020 15:31:27 +0000 (17:31 +0200)]
Remove middleware to secure access API.

4 years agoCorrect feedback @moufmouf
gparant [Sun, 10 May 2020 12:49:49 +0000 (14:49 +0200)]
Correct feedback @moufmouf

4 years agoUpdate back/src/Controller/MapController.ts
grégoire parant [Sun, 10 May 2020 12:48:58 +0000 (14:48 +0200)]
Update back/src/Controller/MapController.ts

Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
4 years agoUpdate back/src/Controller/MapController.ts
grégoire parant [Sun, 10 May 2020 12:48:34 +0000 (14:48 +0200)]
Update back/src/Controller/MapController.ts

Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
4 years agoPermit to dissociate data by room
gparant [Sun, 10 May 2020 11:58:32 +0000 (13:58 +0200)]
Permit to dissociate data by room

 - Update share room id.
 - Join room when a scene is loaded.
 - Add a room in constant variable.

4 years agoManage multi scene
gparant [Sat, 9 May 2020 19:28:50 +0000 (21:28 +0200)]
Manage multi scene

 - Create position and check if user is in position to switch in the next scene.
 - When scene is load, we load all scene in the layer of name "exit".
 - Layer "exit" of map.json have a parametter "exitSceneKey" to identify next scene.
 - Add layer "start", the player could start in the scene on the object present in the layer of name "start".

4 years agoMulti Scene in back end
gparant [Sat, 9 May 2020 17:41:21 +0000 (19:41 +0200)]
Multi Scene in back end

 - Change maps url to get maps
 - Change GameScene to create scene with file since back end
 - Change LoginScene to upload scene and start game

4 years agoAdd maps in back
gparant [Sat, 9 May 2020 15:50:47 +0000 (17:50 +0200)]
Add maps in back

 - Add all map json in back
 - Create middleware to check authentification user
 - Create controllers to get map
 - Create access to get all files in folder Assets/Maps

4 years agoUpdate name map
gparant [Sat, 9 May 2020 14:47:55 +0000 (16:47 +0200)]
Update name map

 - Change name in game scene and login scene

4 years agoAdd map 1st floor
gparant [Sat, 9 May 2020 14:38:13 +0000 (16:38 +0200)]
Add map 1st floor

Rename map to floor 0

4 years agoMerge pull request #85 from thecodingmachine/fix/webrtc-group
David Négrier [Sat, 9 May 2020 07:00:34 +0000 (09:00 +0200)]
Merge pull request #85 from thecodingmachine/fix/webrtc-group

Fix WebRtc group

4 years agoFix manage webrtc room id
gparant [Fri, 8 May 2020 19:17:52 +0000 (21:17 +0200)]
Fix manage webrtc room id

4 years agoFix User depth
gparant [Fri, 8 May 2020 15:35:40 +0000 (17:35 +0200)]
Fix User depth

 - Update strategy layers depth
 - Add depth to manager layers positions between all users

4 years agoMerge pull request #83 from thecodingmachine/cleanup_rename_frame
David Négrier [Fri, 8 May 2020 14:21:16 +0000 (16:21 +0200)]
Merge pull request #83 from thecodingmachine/cleanup_rename_frame

Cleanup: renaming "frame" to "character"

4 years agoMerge pull request #81 from thecodingmachine/display_groups
David Négrier [Fri, 8 May 2020 14:20:56 +0000 (16:20 +0200)]
Merge pull request #81 from thecodingmachine/display_groups

Adding the display of a circle around the group

4 years agoMerge pull request #82 from thecodingmachine/fix/webrtc
David Négrier [Fri, 8 May 2020 14:14:49 +0000 (16:14 +0200)]
Merge pull request #82 from thecodingmachine/fix/webrtc

Fix webrtc

4 years agoRefactoring display of circle around group
David Négrier [Fri, 8 May 2020 14:09:50 +0000 (16:09 +0200)]
Refactoring display of circle around group

The circle is now a sprite and not generated on every frame using a giant "graphics" object

4 years agoRenaming frame in tests
David Négrier [Fri, 8 May 2020 13:20:49 +0000 (15:20 +0200)]
Renaming frame in tests

4 years agoCleanup: renaming "frame" to "character"
David Négrier [Fri, 8 May 2020 13:18:22 +0000 (15:18 +0200)]
Cleanup: renaming "frame" to "character"

The "frame" variable actually contains a string pointing to the character selected.
It has nothing to do with a frame which is usually a particular image in an animation.

I'm renaming the variable accross the application to avoid confusion.

4 years agoAdd layer override
gparant [Fri, 8 May 2020 11:18:34 +0000 (13:18 +0200)]
Add layer override

4 years agoPersonalization of DAM office
gparant [Fri, 8 May 2020 10:43:02 +0000 (12:43 +0200)]
Personalization of DAM office

4 years agoFix lint tsc
gparant [Fri, 8 May 2020 09:58:09 +0000 (11:58 +0200)]
Fix lint tsc

4 years agoFix shares information to enter into Webrtc room.
gparant [Fri, 8 May 2020 09:54:47 +0000 (11:54 +0200)]
Fix shares information to enter into Webrtc room.

- Refactor share position in world class.
- Update selects a client to send information about connecting WebRtc room.

4 years agoFix webrtc back
gparant [Fri, 8 May 2020 09:16:49 +0000 (11:16 +0200)]
Fix webrtc back

 - Add refuse to join if webrtc room have 4 players.

4 years agoAdding the display of a circle around the group
David Négrier [Thu, 7 May 2020 22:35:36 +0000 (00:35 +0200)]
Adding the display of a circle around the group

This PR adds the display of a circle around groups. This is useful to view where you need to go to speak to someone but also to debug.

Note: implementation is suboptimal, relying on a "graphics" object that is known to be slow. In the future, we need to use a circle as a sprite instead.

4 years agoMerge pull request #80 from thecodingmachine/display_groups
David Négrier [Thu, 7 May 2020 22:33:41 +0000 (00:33 +0200)]
Merge pull request #80 from thecodingmachine/display_groups

Fixing "none" animation does not exist log

4 years agoFixing "none" animation does not exist log
David Négrier [Thu, 7 May 2020 21:33:21 +0000 (23:33 +0200)]
Fixing "none" animation does not exist log

4 years agoMerge pull request #76 from thecodingmachine/feature/login-page
David Négrier [Wed, 6 May 2020 07:47:44 +0000 (09:47 +0200)]
Merge pull request #76 from thecodingmachine/feature/login-page

Feature/login page

4 years agoMerge branch 'master' into feature/login-page
gparant [Wed, 6 May 2020 00:20:28 +0000 (02:20 +0200)]
Merge branch 'master' into feature/login-page

# Conflicts:
# front/src/Phaser/Game/GameScene.ts
# front/src/Phaser/Login/LogincScene.ts

4 years agoFix CI
gparant [Wed, 6 May 2020 00:17:07 +0000 (02:17 +0200)]
Fix CI

4 years agoDelete comment
gparant [Wed, 6 May 2020 00:13:00 +0000 (02:13 +0200)]
Delete comment

4 years agoFix to add frame of player user
gparant [Wed, 6 May 2020 00:12:37 +0000 (02:12 +0200)]
Fix to add frame of player user

4 years agoMerge branch 'refactoring_messages' into feature/login-page
gparant [Tue, 5 May 2020 23:58:04 +0000 (01:58 +0200)]
Merge branch 'refactoring_messages' into feature/login-page

# Conflicts:
# front/src/Phaser/Player/Player.ts

4 years agoSend event and play animation with user frame
gparant [Tue, 5 May 2020 23:50:01 +0000 (01:50 +0200)]
Send event and play animation with user frame

4 years agoOnly sending move events if the player actually moved
David Négrier [Mon, 4 May 2020 21:11:59 +0000 (23:11 +0200)]
Only sending move events if the player actually moved

If the player did not move a pixel (and if it did not change direction), then do not send an event to save bandwidth and processing.

4 years agoMerge pull request #77 from thecodingmachine/e2efix
David Négrier [Mon, 4 May 2020 16:48:03 +0000 (18:48 +0200)]
Merge pull request #77 from thecodingmachine/e2efix

Fixing Cypress tests

4 years agoFixing Cypress tests
David Négrier [Mon, 4 May 2020 16:38:04 +0000 (18:38 +0200)]
Fixing Cypress tests

4 years agoFix unit test
gparant [Mon, 4 May 2020 06:44:07 +0000 (08:44 +0200)]
Fix unit test

4 years agoFix CI
gparant [Sun, 3 May 2020 23:54:49 +0000 (01:54 +0200)]
Fix CI

4 years agoAdd select player in login page
gparant [Sun, 3 May 2020 23:48:14 +0000 (01:48 +0200)]
Add select player in login page

4 years agoName of map users
gparant [Sun, 3 May 2020 20:24:14 +0000 (22:24 +0200)]
Name of map users

 - Add name on user
 - Delete NonPlayer class not used

4 years agoFixing master deployment
David Négrier [Sun, 3 May 2020 16:51:25 +0000 (18:51 +0200)]
Fixing master deployment

4 years agoMerge pull request #69 from thecodingmachine/improve_welcome_screen
David Négrier [Sun, 3 May 2020 16:21:24 +0000 (18:21 +0200)]
Merge pull request #69 from thecodingmachine/improve_welcome_screen

Improving welcome screen

4 years agoMerge from master
David Négrier [Sun, 3 May 2020 16:04:01 +0000 (18:04 +0200)]
Merge from master

4 years agoMerge pull request #72 from thecodingmachine/event_group
David Négrier [Sun, 3 May 2020 16:02:12 +0000 (18:02 +0200)]
Merge pull request #72 from thecodingmachine/event_group

Refactoring events to connect/disconnect a user to a group

4 years agoMerge branch 'master' of github.com:thecodingmachine/workadventure into event_group
David Négrier [Sun, 3 May 2020 15:53:05 +0000 (17:53 +0200)]
Merge branch 'master' of github.com:thecodingmachine/workadventure into event_group

4 years agoMerge pull request #73 from thecodingmachine/groupradius
David Négrier [Sun, 3 May 2020 15:52:46 +0000 (17:52 +0200)]
Merge pull request #73 from thecodingmachine/groupradius

Making the group radius distinct from the minimum distance to connect 2 players

4 years agoMerge
David Négrier [Sun, 3 May 2020 15:47:54 +0000 (17:47 +0200)]
Merge

4 years agoReducing connection distance and group radius
David Négrier [Sun, 3 May 2020 15:46:26 +0000 (17:46 +0200)]
Reducing connection distance and group radius

4 years agoMerge pull request #70 from thecodingmachine/webrtc
David Négrier [Sun, 3 May 2020 15:38:44 +0000 (17:38 +0200)]
Merge pull request #70 from thecodingmachine/webrtc

Webrtc

4 years agoAdd feature to mute or switch off cam
gparant [Sun, 3 May 2020 15:19:42 +0000 (17:19 +0200)]
Add feature to mute or switch off cam

4 years agoMaking the group radius distinct from the minimum distance to connect 2 players
David Négrier [Sun, 3 May 2020 14:56:19 +0000 (16:56 +0200)]
Making the group radius distinct from the minimum distance to connect 2 players

Also, changed default settings from 160px for Group Radius to 120px
(minimum distance to connect 2 players remains 160px)

4 years agoFix update callback
gparant [Sun, 3 May 2020 14:30:22 +0000 (16:30 +0200)]
Fix update callback

4 years agoConnect and Disconnect event.
gparant [Sun, 3 May 2020 14:28:18 +0000 (16:28 +0200)]
Connect and Disconnect event.

4 years agoImproving test
David Négrier [Sun, 3 May 2020 14:22:42 +0000 (16:22 +0200)]
Improving test

4 years agoMerge branch 'event_group' into webrtc
gparant [Sun, 3 May 2020 14:18:05 +0000 (16:18 +0200)]
Merge branch 'event_group' into webrtc

# Conflicts:
# back/src/Model/Group.ts
# back/src/Model/World.ts

4 years agoRefactoring events to connect/disconnect a user to a group
David Négrier [Sun, 3 May 2020 14:08:04 +0000 (16:08 +0200)]
Refactoring events to connect/disconnect a user to a group

4 years agoMerge
David Négrier [Sun, 3 May 2020 13:51:16 +0000 (15:51 +0200)]
Merge