David Négrier [Sat, 16 May 2020 14:07:38 +0000 (16:07 +0200)]
Code cleaning
David Négrier [Sat, 16 May 2020 13:58:20 +0000 (15:58 +0200)]
Cleaning up tests
David Négrier [Sat, 16 May 2020 13:51:00 +0000 (15:51 +0200)]
Removing broken import
David Négrier [Sat, 16 May 2020 13:44:40 +0000 (15:44 +0200)]
Removing the Message class and merging it with MessageUserPosition (since it is only ever used it in MessageUserPosition)
Taking advantage of the TypeScript Constructor Assignment too to reduce the amount of code!
David Négrier [Fri, 15 May 2020 22:19:27 +0000 (00:19 +0200)]
Getting rid of roomId in Message class (this is not needed since all messages sent are for the room we are currently in)
David Négrier [Fri, 15 May 2020 21:40:05 +0000 (23:40 +0200)]
When sharing user position, only position is sent now!
David Négrier [Fri, 15 May 2020 21:24:04 +0000 (23:24 +0200)]
JoinRoom now ONLY sends the roomId.
David Négrier [Fri, 15 May 2020 21:17:58 +0000 (23:17 +0200)]
Fixing test
David Négrier [Fri, 15 May 2020 20:40:06 +0000 (22:40 +0200)]
Sending player details (name + character selected) on connection
David Négrier [Fri, 15 May 2020 20:09:21 +0000 (22:09 +0200)]
More code removal
David Négrier [Fri, 15 May 2020 20:08:53 +0000 (22:08 +0200)]
More code removal
David Négrier [Fri, 15 May 2020 20:04:49 +0000 (22:04 +0200)]
Refactoring messages
Socket.io can stringify JSON messages itself, so there is no need to pass a string to "emit". You can pass a serializable object!
This commit removes all the useless toJson() methods, JSON.serialize and JSON.parse!
Woot!
David Négrier [Fri, 15 May 2020 19:34:12 +0000 (21:34 +0200)]
Merge pull request #116 from thecodingmachine/remove_userid
Completely getting rid of "userid"
David Négrier [Thu, 14 May 2020 21:19:48 +0000 (23:19 +0200)]
Completely getting rid of "userid"
Previously, userid was generated by the "/login" route and passed along.
This commit completely removes the uuid "userid" (and disables the LoginController too and any Jwt check).
"userid" is replaced by the "socket id" of the connection.
So a user is now identified using a socket id, which is unique for a given connection.
David Négrier [Thu, 14 May 2020 20:02:41 +0000 (22:02 +0200)]
Merge pull request #113 from thecodingmachine/display_circle_on_startup
Displaying circle on join
David Négrier [Thu, 14 May 2020 20:00:45 +0000 (22:00 +0200)]
Merge pull request #115 from thecodingmachine/update-webrtc
Update media webrtc
David Négrier [Thu, 14 May 2020 20:00:31 +0000 (22:00 +0200)]
Removing log trace
gparant [Thu, 14 May 2020 19:00:52 +0000 (21:00 +0200)]
Minor update floor0 and floor1
gparant [Thu, 14 May 2020 18:54:34 +0000 (20:54 +0200)]
Fix border view
gparant [Thu, 14 May 2020 18:39:30 +0000 (20:39 +0200)]
Media webrtcA
- Update peerConnexion manage
- Add muted microphone logo
- Add icon user
- Sound when user enter in room webrtc
David Négrier [Wed, 13 May 2020 21:11:10 +0000 (23:11 +0200)]
Displaying circle on join
So far, someone joining a map would not see the circles of groups already formed until someone moves in the group (because the "circle_moved_or_updated" event was not fired when someone arrives)
This commit fixes this behaviour. Someone entering a room will receive an event for each and every group currently formed.
gparant [Wed, 13 May 2020 20:36:34 +0000 (22:36 +0200)]
Minor changes map floor 0
David Négrier [Wed, 13 May 2020 20:28:17 +0000 (22:28 +0200)]
Merge pull request #111 from thecodingmachine/new-floor0
New map floor0
David Négrier [Wed, 13 May 2020 20:24:53 +0000 (22:24 +0200)]
Merge pull request #112 from thecodingmachine/debug/improve_message
More detailed error log to debug disconnect issue
David Négrier [Wed, 13 May 2020 20:20:34 +0000 (22:20 +0200)]
Fixing CD
David Négrier [Wed, 13 May 2020 20:11:05 +0000 (22:11 +0200)]
More detailed error log to debug disconnect issue
gparant [Wed, 13 May 2020 20:09:02 +0000 (22:09 +0200)]
New map floor0
David Négrier [Wed, 13 May 2020 20:03:56 +0000 (22:03 +0200)]
Merge pull request #109 from thecodingmachine/Auto-reconnect
Auto-reconnect
David Négrier [Wed, 13 May 2020 19:48:09 +0000 (21:48 +0200)]
Merge pull request #108 from thecodingmachine/bugFixes
fixed a game crash on firefox on http
gparant [Wed, 13 May 2020 18:22:42 +0000 (20:22 +0200)]
Auto-reconnect
kharhamel [Wed, 13 May 2020 14:56:22 +0000 (16:56 +0200)]
fixed a game crash on firefox on http
David Négrier [Wed, 13 May 2020 14:17:58 +0000 (16:17 +0200)]
Fixing 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
David Négrier [Wed, 13 May 2020 13:58:17 +0000 (15:58 +0200)]
Not adding comment on push (only pull_request)
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.
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
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
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
David Négrier [Wed, 13 May 2020 07:29:18 +0000 (09:29 +0200)]
Fixing htaccess redirect
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
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
David Négrier [Mon, 11 May 2020 21:26:40 +0000 (23:26 +0200)]
Refactoring/centralizing map loading in GameManager
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
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.
gparant [Tue, 12 May 2020 00:01:18 +0000 (02:01 +0200)]
Minor update layer position in map floor0 and floor1
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
David Négrier [Mon, 11 May 2020 22:38:24 +0000 (00:38 +0200)]
Fixing exit points
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
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
gparant [Mon, 11 May 2020 22:22:55 +0000 (00:22 +0200)]
Minor Fix overflow css style
NIP [Mon, 11 May 2020 21:42:10 +0000 (23:42 +0200)]
Add KEN office to the map
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
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
gparant [Mon, 11 May 2020 19:16:14 +0000 (21:16 +0200)]
Fix depth error in the first floor
gparant [Mon, 11 May 2020 18:55:17 +0000 (20:55 +0200)]
Fix CI lint
gparant [Mon, 11 May 2020 18:53:23 +0000 (20:53 +0200)]
Fix position layer in map lyon
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
David Négrier [Mon, 11 May 2020 17:19:42 +0000 (19:19 +0200)]
Fixing typo
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
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)
William [Mon, 11 May 2020 12:00:15 +0000 (14:00 +0200)]
use start and exit layers on map
gparant [Mon, 11 May 2020 11:19:48 +0000 (13:19 +0200)]
Delete params not used
gparant [Mon, 11 May 2020 11:17:02 +0000 (13:17 +0200)]
Fix update world back end and deleting group in front end
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
David Négrier [Mon, 11 May 2020 06:51:46 +0000 (08:51 +0200)]
Rewording exit paragraph
gparant [Sun, 10 May 2020 22:32:37 +0000 (00:32 +0200)]
Fix exit tile map of floot1
gparant [Sun, 10 May 2020 22:25:06 +0000 (00:25 +0200)]
Fix url to get the next map in GameScene
gparant [Sun, 10 May 2020 22:07:54 +0000 (00:07 +0200)]
Add explain to have multi exit layers into the map
gparant [Sun, 10 May 2020 21:49:08 +0000 (23:49 +0200)]
Fix error mapping refresh in back & the end of this feature development
gparant [Sun, 10 May 2020 17:54:41 +0000 (19:54 +0200)]
Refactor leave and join room
gparant [Sun, 10 May 2020 17:45:17 +0000 (19:45 +0200)]
Change to update world by scene and room id
gparant [Sun, 10 May 2020 16:34:55 +0000 (18:34 +0200)]
Fix feedback @moufmouf strategy of maps managing by back.
gparant [Sun, 10 May 2020 15:55:30 +0000 (17:55 +0200)]
Fix feedback @moufmouf on circle texture
gparant [Sun, 10 May 2020 15:31:27 +0000 (17:31 +0200)]
Remove middleware to secure access API.
gparant [Sun, 10 May 2020 12:49:49 +0000 (14:49 +0200)]
Correct feedback @moufmouf
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>
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>
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.
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".
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
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
gparant [Sat, 9 May 2020 14:47:55 +0000 (16:47 +0200)]
Update name map
- Change name in game scene and login scene
gparant [Sat, 9 May 2020 14:38:13 +0000 (16:38 +0200)]
Add map 1st floor
Rename map to floor 0
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
gparant [Fri, 8 May 2020 19:17:52 +0000 (21:17 +0200)]
Fix manage webrtc room id
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
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"
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
David Négrier [Fri, 8 May 2020 14:14:49 +0000 (16:14 +0200)]
Merge pull request #82 from thecodingmachine/fix/webrtc
Fix webrtc
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
David Négrier [Fri, 8 May 2020 13:20:49 +0000 (15:20 +0200)]
Renaming frame in tests
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.
gparant [Fri, 8 May 2020 11:18:34 +0000 (13:18 +0200)]
Add layer override
gparant [Fri, 8 May 2020 10:43:02 +0000 (12:43 +0200)]
Personalization of DAM office
gparant [Fri, 8 May 2020 09:58:09 +0000 (11:58 +0200)]
Fix lint tsc
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.
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.
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.
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
David Négrier [Thu, 7 May 2020 21:33:21 +0000 (23:33 +0200)]
Fixing "none" animation does not exist log