libreadventure.git
4 years agoRemoving comment
David Négrier [Sun, 3 May 2020 13:31:20 +0000 (15:31 +0200)]
Removing comment

4 years agoPutting the name in GameManager rather than passing it from scene to scene.
David Négrier [Sun, 3 May 2020 13:29:40 +0000 (15:29 +0200)]
Putting the name in GameManager rather than passing it from scene to scene.

4 years agoAdding login method back for future use in LogincScene
David Négrier [Sun, 3 May 2020 13:18:15 +0000 (15:18 +0200)]
Adding login method back for future use in LogincScene

4 years agoFixing linting
David Négrier [Fri, 1 May 2020 21:48:30 +0000 (23:48 +0200)]
Fixing linting

4 years agoDisplaying the name of a player above its head (names are not passed through the...
David Négrier [Fri, 1 May 2020 21:38:09 +0000 (23:38 +0200)]
Displaying the name of a player above its head (names are not passed through the network yet)

4 years agoChanged font from text
David Négrier [Fri, 1 May 2020 21:19:51 +0000 (23:19 +0200)]
Changed font from text
Input name can only be 4 characters long
Passing name to next scene

4 years agoAdding logo in the bottom right corner and placing help text in function of height
David Négrier [Fri, 1 May 2020 20:23:41 +0000 (22:23 +0200)]
Adding logo in the bottom right corner and placing help text in function of height

4 years agoMerge pull request #68 from thecodingmachine/improveAnims
David Négrier [Fri, 1 May 2020 20:03:06 +0000 (22:03 +0200)]
Merge pull request #68 from thecodingmachine/improveAnims

reenabled diagonal movement

4 years agoreenabled diagonal movement
kharhamel [Thu, 30 Apr 2020 17:36:28 +0000 (19:36 +0200)]
reenabled diagonal movement

4 years agoMerge pull request #67 from thecodingmachine/loginSceneFix
Kharhamel [Thu, 30 Apr 2020 17:20:44 +0000 (19:20 +0200)]
Merge pull request #67 from thecodingmachine/loginSceneFix

remove the GameSceneInterface from LoginScene

4 years agoremove the GameSceneInterface from LoginScene
kharhamel [Thu, 30 Apr 2020 17:18:35 +0000 (19:18 +0200)]
remove the GameSceneInterface from LoginScene

4 years agoMerge pull request #63 from thecodingmachine/barycenter_based_groups
David Négrier [Wed, 29 Apr 2020 21:28:23 +0000 (23:28 +0200)]
Merge pull request #63 from thecodingmachine/barycenter_based_groups

Barycenter based groups

4 years agoAdding support for leaving the group if the socket is closed
David Négrier [Wed, 29 Apr 2020 21:18:42 +0000 (23:18 +0200)]
Adding support for leaving the group if the socket is closed

4 years agoFirst working version with disconnection
David Négrier [Wed, 29 Apr 2020 21:12:55 +0000 (23:12 +0200)]
First working version with disconnection

4 years agoSwitching connection to a barycenter approach
David Négrier [Wed, 29 Apr 2020 20:41:48 +0000 (22:41 +0200)]
Switching connection to a barycenter approach

4 years agoMerge branch 'feature/back-players-proximity' into barycenter_based_groups
David Négrier [Wed, 29 Apr 2020 20:06:37 +0000 (22:06 +0200)]
Merge branch 'feature/back-players-proximity' into barycenter_based_groups

4 years agoMerge pull request #54 from thecodingmachine/webrtc
David Négrier [Wed, 29 Apr 2020 16:10:21 +0000 (18:10 +0200)]
Merge pull request #54 from thecodingmachine/webrtc

Create webrtc connexion

4 years agoDelete file
gparant [Wed, 29 Apr 2020 15:55:55 +0000 (17:55 +0200)]
Delete file

4 years agoRefactor
gparant [Wed, 29 Apr 2020 15:49:40 +0000 (17:49 +0200)]
Refactor

4 years agoMerge remote-tracking branch 'github.com/master' into webrtc
gparant [Wed, 29 Apr 2020 15:37:17 +0000 (17:37 +0200)]
Merge remote-tracking branch 'github.com/master' into webrtc

# Conflicts:
# front/src/Connexion.ts
# front/src/Phaser/Game/GameManager.ts
# front/src/Phaser/Game/GameScene.ts
# front/src/index.ts

4 years agoMerge pull request #61 from thecodingmachine/simplify
David Négrier [Wed, 29 Apr 2020 15:11:22 +0000 (17:11 +0200)]
Merge pull request #61 from thecodingmachine/simplify

first step in simplification: remove the concept of room in the front…

4 years agoMerge world and webrtc conexion
gparant [Tue, 28 Apr 2020 23:40:32 +0000 (01:40 +0200)]
Merge world and webrtc conexion

4 years agoMerge branch 'master' into webrtc
gparant [Tue, 28 Apr 2020 22:05:16 +0000 (00:05 +0200)]
Merge branch 'master' into webrtc

# Conflicts:
# back/src/Model/Websocket/MessageUserPosition.ts

4 years agoFix integration login scene in game manager
gparant [Tue, 28 Apr 2020 22:01:37 +0000 (00:01 +0200)]
Fix integration login scene in game manager

4 years agoAdding TODO comment
David Négrier [Tue, 28 Apr 2020 21:23:50 +0000 (23:23 +0200)]
Adding TODO comment

4 years agoAdding a (failing test) for disconnecting users
David Négrier [Tue, 28 Apr 2020 21:01:56 +0000 (23:01 +0200)]
Adding a (failing test) for disconnecting users

4 years agoMerge pull request #57 from thecodingmachine/characters
David Négrier [Tue, 28 Apr 2020 20:51:24 +0000 (22:51 +0200)]
Merge pull request #57 from thecodingmachine/characters

Adding a huge collection of characters to play with

4 years agoMerge pull request #25 from thecodingmachine/feature/back-players-proximity
David Négrier [Tue, 28 Apr 2020 20:49:31 +0000 (22:49 +0200)]
Merge pull request #25 from thecodingmachine/feature/back-players-proximity

Backend - compute proximity between players and create groups of close users

4 years agoManually fixing a weird lint bug in eslint
David Négrier [Tue, 28 Apr 2020 20:40:54 +0000 (22:40 +0200)]
Manually fixing a weird lint bug in eslint

4 years agoMerge
David Négrier [Tue, 28 Apr 2020 20:31:54 +0000 (22:31 +0200)]
Merge

4 years agoMerge branch 'master' into webrtc
gparant [Tue, 28 Apr 2020 18:50:51 +0000 (20:50 +0200)]
Merge branch 'master' into webrtc

# Conflicts:
# front/src/Phaser/Game/GameManager.ts

4 years agoMerge branch 'master' of github.com:thecodingmachine/workadventure into simplify
David Négrier [Mon, 27 Apr 2020 20:39:46 +0000 (22:39 +0200)]
Merge branch 'master' of github.com:thecodingmachine/workadventure into simplify

4 years agoAdding a huge collection of characters to play with
David Négrier [Fri, 24 Apr 2020 19:57:59 +0000 (21:57 +0200)]
Adding a huge collection of characters to play with

4 years agoMerge pull request #59 from thecodingmachine/map-v0
David Négrier [Mon, 27 Apr 2020 16:22:24 +0000 (18:22 +0200)]
Merge pull request #59 from thecodingmachine/map-v0

Map v0: Resize chunksize from 16 to 32 pixels

4 years agoPlaying with zoom levels
David Négrier [Mon, 27 Apr 2020 16:12:36 +0000 (18:12 +0200)]
Playing with zoom levels

4 years agofirst step in simplification: remove the concept of room in the front end
kharhamel [Mon, 27 Apr 2020 13:03:05 +0000 (15:03 +0200)]
first step in simplification: remove the concept of room in the front end

4 years agoMerge pull request #53 from Kharhamel/login
Kharhamel [Mon, 27 Apr 2020 11:02:16 +0000 (13:02 +0200)]
Merge pull request #53 from Kharhamel/login

Login screen

4 years agoImplement Distance Merge Request
gparant [Sun, 26 Apr 2020 22:44:25 +0000 (00:44 +0200)]
Implement Distance Merge Request

4 years agoMerge branch 'feature/back-players-proximity' into webrtc
gparant [Sun, 26 Apr 2020 21:34:35 +0000 (23:34 +0200)]
Merge branch 'feature/back-players-proximity' into webrtc

4 years agoMerge branch 'master' into feature/back-players-proximity
gparant [Sun, 26 Apr 2020 21:31:40 +0000 (23:31 +0200)]
Merge branch 'master' into feature/back-players-proximity

# Conflicts:
# back/src/Model/Websocket/MessageUserPosition.ts

4 years agoMerge branch 'master' into webrtc
gparant [Sun, 26 Apr 2020 21:22:40 +0000 (23:22 +0200)]
Merge branch 'master' into webrtc

4 years agoFix import
gparant [Sun, 26 Apr 2020 21:22:13 +0000 (23:22 +0200)]
Fix import

4 years agoFix CI CD
gparant [Sun, 26 Apr 2020 20:35:16 +0000 (22:35 +0200)]
Fix CI CD

4 years agoMerge branch 'master' of github.com:thecodingmachine/workadventure into map-v0
David Négrier [Sun, 26 Apr 2020 19:48:57 +0000 (21:48 +0200)]
Merge branch 'master' of github.com:thecodingmachine/workadventure into map-v0

4 years agoMerge branch 'map-v0' of github.com:thecodingmachine/workadventure into map-v0
David Négrier [Sun, 26 Apr 2020 19:48:42 +0000 (21:48 +0200)]
Merge branch 'map-v0' of github.com:thecodingmachine/workadventure into map-v0

4 years agoAdd button to enter un visio
gparant [Sun, 26 Apr 2020 18:55:20 +0000 (20:55 +0200)]
Add button to enter un visio

4 years agoStart visio with user colision
gparant [Sun, 26 Apr 2020 17:59:51 +0000 (19:59 +0200)]
Start visio with user colision

When user enter in colision with other colision, webrtc start visio

4 years agoWeb visio, add and remove video element
gparant [Sun, 26 Apr 2020 17:12:01 +0000 (19:12 +0200)]
Web visio, add and remove video element

4 years agoprettier login page
kharhamel [Sun, 26 Apr 2020 16:48:41 +0000 (18:48 +0200)]
prettier login page

4 years agobasic login page with a text input and a click button
kharhamel [Sun, 26 Apr 2020 15:54:56 +0000 (17:54 +0200)]
basic login page with a text input and a click button

4 years agoFix send message webrtc
gparant [Sun, 26 Apr 2020 15:43:21 +0000 (17:43 +0200)]
Fix send message webrtc

4 years agoUpdate front mutli peer conncexion
gparant [Sun, 26 Apr 2020 15:42:49 +0000 (17:42 +0200)]
Update front mutli peer conncexion

4 years agoResize chunksize from 16 to 32 pixels
NIP [Sun, 26 Apr 2020 09:46:00 +0000 (11:46 +0200)]
Resize chunksize from 16 to 32 pixels

4 years agoFix multi video
gparant [Sat, 25 Apr 2020 18:29:03 +0000 (20:29 +0200)]
Fix multi video

4 years agoAdd multi SimplePear connection
gparant [Sat, 25 Apr 2020 15:14:05 +0000 (17:14 +0200)]
Add multi SimplePear connection

4 years agoUse WebRtc with SimplePeer
gparant [Sat, 25 Apr 2020 14:05:33 +0000 (16:05 +0200)]
Use WebRtc with SimplePeer

4 years agoMerge pull request #44 from thecodingmachine/map-v0
David Négrier [Fri, 24 Apr 2020 17:08:08 +0000 (19:08 +0200)]
Merge pull request #44 from thecodingmachine/map-v0

My first map representing TCM office grand floor without KEN office

4 years agoMerge pull request #51 from thecodingmachine/constant_speed
David Négrier [Fri, 24 Apr 2020 16:55:47 +0000 (18:55 +0200)]
Merge pull request #51 from thecodingmachine/constant_speed

Computing movement amount from framerate

4 years agoMerge pull request #56 from thecodingmachine/enabling_https
David Négrier [Wed, 22 Apr 2020 21:40:46 +0000 (23:40 +0200)]
Merge pull request #56 from thecodingmachine/enabling_https

Enabling HTTPS in test deployment

4 years agoSwitching tests on https too
David Négrier [Wed, 22 Apr 2020 21:34:56 +0000 (23:34 +0200)]
Switching tests on https too

4 years agoFixing API link to HTTPS
David Négrier [Wed, 22 Apr 2020 21:27:30 +0000 (23:27 +0200)]
Fixing API link to HTTPS

4 years agoEnabling HTTPS in test deployment
David Négrier [Wed, 22 Apr 2020 17:16:04 +0000 (19:16 +0200)]
Enabling HTTPS in test deployment

4 years agoAdapting deeployer to new format
David Négrier [Wed, 22 Apr 2020 10:31:17 +0000 (12:31 +0200)]
Adapting deeployer to new format

4 years agoFix webrtc
gparant [Sun, 19 Apr 2020 23:10:47 +0000 (01:10 +0200)]
Fix webrtc

4 years agoFix video call
gparant [Sun, 19 Apr 2020 20:30:42 +0000 (22:30 +0200)]
Fix video call

4 years agoCreate webrtc connexion between two player
gparant [Sun, 19 Apr 2020 17:32:38 +0000 (19:32 +0200)]
Create webrtc connexion between two player

4 years agoComputing movement amount from framerate
David Négrier [Sat, 18 Apr 2020 15:16:39 +0000 (17:16 +0200)]
Computing movement amount from framerate

Depending on the amount of power a computer has, the framerate will not be the same.
Hence, the amount of movement of a user should be constant on each frame.
If a frame was slow to print, the movement should be higher to keep a constant speed.

This PR takes the framerate into account when moving the players.

4 years agoAdd new map with embed tileset
NIP [Fri, 17 Apr 2020 16:39:54 +0000 (18:39 +0200)]
Add new map with embed tileset

4 years agoMerge branch 'map-v0' of github.com:thecodingmachine/workadventure into map-v0
David Négrier [Thu, 16 Apr 2020 20:44:44 +0000 (22:44 +0200)]
Merge branch 'map-v0' of github.com:thecodingmachine/workadventure into map-v0

4 years agoMerge
David Négrier [Thu, 16 Apr 2020 20:44:31 +0000 (22:44 +0200)]
Merge

4 years agoMerge pull request #50 from thecodingmachine/e2e
David Négrier [Thu, 16 Apr 2020 20:42:02 +0000 (22:42 +0200)]
Merge pull request #50 from thecodingmachine/e2e

WIP: implemented basic e2e testing for k8s environment

4 years agoRemoving E2E test from running in CI (it is run in K8S now)
David Négrier [Thu, 16 Apr 2020 20:31:48 +0000 (22:31 +0200)]
Removing E2E test from running in CI (it is run in K8S now)

4 years agoMERGE and add floorLayer
NIP [Thu, 16 Apr 2020 19:55:34 +0000 (21:55 +0200)]
MERGE and add floorLayer

4 years agoAdd floorLayer to the map
NIP [Thu, 16 Apr 2020 19:37:31 +0000 (21:37 +0200)]
Add floorLayer to the map

4 years agoFixing bad file name
David Négrier [Wed, 15 Apr 2020 22:13:40 +0000 (00:13 +0200)]
Fixing bad file name

4 years agoTrying to change Cypress basu URL
David Négrier [Wed, 15 Apr 2020 22:06:24 +0000 (00:06 +0200)]
Trying to change Cypress basu URL

4 years agoBackporting master changes
David Négrier [Wed, 15 Apr 2020 21:57:36 +0000 (23:57 +0200)]
Backporting master changes

4 years agoRunning e2e tests on K8S environment
David Négrier [Wed, 15 Apr 2020 21:54:55 +0000 (23:54 +0200)]
Running e2e tests on K8S environment

4 years agoFirst working version of the office map! Yay!
David Négrier [Wed, 15 Apr 2020 21:31:39 +0000 (23:31 +0200)]
First working version of the office map! Yay!

4 years agoMerge pull request #48 from moufmouf/autoload_tiles
David Négrier [Wed, 15 Apr 2020 21:13:14 +0000 (23:13 +0200)]
Merge pull request #48 from moufmouf/autoload_tiles

Removing all reference to 'Tiles' constant in code

4 years agoAdding automatic loading of layers
David Négrier [Wed, 15 Apr 2020 21:10:12 +0000 (23:10 +0200)]
Adding automatic loading of layers

4 years agoRemoving all reference to 'Tiles' constant in code
David Négrier [Wed, 15 Apr 2020 17:39:26 +0000 (19:39 +0200)]
Removing all reference to 'Tiles' constant in code

4 years agoMerging
David Négrier [Wed, 15 Apr 2020 17:30:49 +0000 (19:30 +0200)]
Merging

4 years agoMerge pull request #47 from moufmouf/autoload_tiles
David Négrier [Wed, 15 Apr 2020 17:27:40 +0000 (19:27 +0200)]
Merge pull request #47 from moufmouf/autoload_tiles

Autoload tiles

4 years agoAutoload tiles
David Négrier [Wed, 15 Apr 2020 17:23:06 +0000 (19:23 +0200)]
Autoload tiles

This commit adds a listener in the preload function that will be triggered as soon as the map is loaded.
This function will load the resources from the map (tilesets) defined in the map.
That way, we don't have to define manually the list of tiles that have to be loaded (at the expense of a slight delay in loading since we must wait for the map to be loaded to start loading the tiles).

4 years agofixed the version mismatch of cypress between local and ci
kharhamel [Tue, 14 Apr 2020 18:54:27 +0000 (20:54 +0200)]
fixed the version mismatch of cypress between local and ci

4 years agoadded artifact download
kharhamel [Tue, 14 Apr 2020 18:42:57 +0000 (20:42 +0200)]
added artifact download

4 years agointegrate it into the ci
kharhamel [Tue, 14 Apr 2020 18:16:51 +0000 (20:16 +0200)]
integrate it into the ci

4 years agoimplemented basic e2e testing
kharhamel [Tue, 14 Apr 2020 18:04:55 +0000 (20:04 +0200)]
implemented basic e2e testing

4 years agoFix JS issue regarding multiple tilesets
NIP [Mon, 13 Apr 2020 19:24:48 +0000 (21:24 +0200)]
Fix JS issue regarding multiple tilesets

4 years agoChange GameScene to import new png, change map name and add missing png files
NIP [Mon, 13 Apr 2020 18:34:19 +0000 (20:34 +0200)]
Change GameScene to import new png, change map name and add missing png files

4 years agoMerge pull request #45 from Kharhamel/camera
grégoire parant [Mon, 13 Apr 2020 18:08:33 +0000 (20:08 +0200)]
Merge pull request #45 from Kharhamel/camera

Better camera code

4 years agoChange calque names into game scene TS file
NIP [Mon, 13 Apr 2020 18:05:13 +0000 (20:05 +0200)]
Change calque names into game scene TS file

4 years agodeleted cameraManager, use camera follow code instead
kharhamel [Mon, 13 Apr 2020 17:56:41 +0000 (19:56 +0200)]
deleted cameraManager, use camera follow code instead

4 years agoAdd tilesets
NIP [Mon, 13 Apr 2020 17:52:25 +0000 (19:52 +0200)]
Add tilesets

4 years agocreate an env variable for debug mode
kharhamel [Mon, 13 Apr 2020 17:40:10 +0000 (19:40 +0200)]
create an env variable for debug mode

4 years agoMy first map representing TCM office grand floor without KEN office
NIP [Mon, 13 Apr 2020 17:38:28 +0000 (19:38 +0200)]
My first map representing TCM office grand floor without KEN office

4 years agoMerge pull request #41 from thecodingmachine/one_env_per_branch
David Négrier [Mon, 13 Apr 2020 16:52:56 +0000 (18:52 +0200)]
Merge pull request #41 from thecodingmachine/one_env_per_branch

Deploying one environment per branch

4 years agoUsing tagged version for rlespinasse/github-slug-action
David Négrier [Mon, 13 Apr 2020 16:34:13 +0000 (18:34 +0200)]
Using tagged version for rlespinasse/github-slug-action

4 years agoFixing version
David Négrier [Mon, 13 Apr 2020 16:33:27 +0000 (18:33 +0200)]
Fixing version