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

124 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Négrier 9364cb3b12 Alais did not work, reverting 2020-04-24 18:58:26 +02:00
kharhamel 60606947ab temp 2020-04-19 20:58:02 +02:00
kharhamel 61c6b9dacb created a login screen 2020-04-19 18:39:59 +02:00
kharhamel f3fdcba16a removed the rock 2020-04-19 16:48:47 +02:00
David Négrier 0f2e21e88e
Merge pull request #50 from thecodingmachine/e2e 
WIP: implemented basic e2e testing for k8s environment
 2020-04-16 22:42:02 +02:00
David Négrier c4b9c02d75 Removing E2E test from running in CI (it is run in K8S now) 2020-04-16 22:36:54 +02:00
David Négrier c0f2b890ef Fixing bad file name 2020-04-16 00:13:40 +02:00
David Négrier 75941a5c68 Trying to change Cypress basu URL 2020-04-16 00:06:24 +02:00
David Négrier 9175682f32 Backporting master changes 2020-04-15 23:57:36 +02:00
David Négrier 84edc1a2c4 Running e2e tests on K8S environment 2020-04-15 23:54:55 +02:00
David Négrier 258c792531
Merge pull request #48 from moufmouf/autoload_tiles 
Removing all reference to 'Tiles' constant in code
 2020-04-15 23:13:14 +02:00
David Négrier 8ddd4656e6 Adding automatic loading of layers 2020-04-15 23:10:12 +02:00
David Négrier 5f118c2a4a Removing all reference to 'Tiles' constant in code 2020-04-15 19:39:26 +02:00
David Négrier b7220a6724
Merge pull request #47 from moufmouf/autoload_tiles 
Autoload tiles
 2020-04-15 19:27:40 +02:00
David Négrier 482a344f45 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).
 2020-04-15 19:23:06 +02:00
kharhamel 935745b3b5 fixed the version mismatch of cypress between local and ci 2020-04-14 20:54:27 +02:00
kharhamel 5fb3968234 added artifact download 2020-04-14 20:42:57 +02:00
kharhamel 56093201fb integrate it into the ci 2020-04-14 20:23:00 +02:00
kharhamel a2ed7164e4 implemented basic e2e testing 2020-04-14 20:04:55 +02:00
grégoire parant 705617abe7
Merge pull request #45 from Kharhamel/camera 
Better camera code
 2020-04-13 20:08:33 +02:00
kharhamel 1774594e76 deleted cameraManager, use camera follow code instead 2020-04-13 19:57:14 +02:00
kharhamel 33c58874e0 create an env variable for debug mode 2020-04-13 19:40:10 +02:00
David Négrier 751a9f40e5
Merge pull request #41 from thecodingmachine/one_env_per_branch 
Deploying one environment per branch
 2020-04-13 18:52:56 +02:00
David Négrier 6bf7a3eb43 Using tagged version for rlespinasse/github-slug-action 2020-04-13 18:44:12 +02:00
David Négrier 3a788b7c15 Fixing version 2020-04-13 18:44:12 +02:00
David Négrier 226fbb1e9e Adding a message with deployment location at the end of deployment 2020-04-13 18:44:12 +02:00
David Négrier 62e28bed10 Fixing slugify issue 2020-04-13 18:44:12 +02:00
David Négrier efccdcbb06 Fixing action 2020-04-13 18:44:12 +02:00
David Négrier 0ba6941cd2 Fixing ref slug 2020-04-13 18:44:12 +02:00
David Négrier d519538531 Fixing libsonnet and changing deployment namespace 2020-04-13 18:44:12 +02:00
David Négrier b0c347b41b Triggering build and deploy on every branch 2020-04-13 18:44:12 +02:00
David Négrier b5901b253a Deploying one environment per branch 2020-04-13 18:44:12 +02:00
grégoire parant 1c833f6114
Merge pull request #42 from gparant/refactor-sizing-character 
Refactor sizing hitbox character
 2020-04-13 17:04:33 +02:00
gparant d6653c61cc Add comment talk when user have a collision & comment collision shwon 2020-04-13 16:56:06 +02:00
gparant ba3f0e07f8 Refactor sizing hitbox charactere 2020-04-13 16:53:19 +02:00
grégoire parant 2ce6ed2d48
Merge pull request #40 from thecodingmachine/kharhamel-interaction 
conflict interaction @Kharhamel
 2020-04-13 16:10:09 +02:00
gparant b391ee271a Fix move & stop player 2020-04-13 15:41:11 +02:00
gparant ab70b28bb3 Fix, current player say 2020-04-13 15:35:38 +02:00
gparant 2afe6b4b6e Fix feadback @Kharhamel 2020-04-13 15:34:09 +02:00
gparant 48fe86634f Add feature to move bubble 2020-04-13 15:15:20 +02:00
David Négrier d826668273
Merge pull request #35 from thecodingmachine/cd 
Installing a continuous deployement environement
 2020-04-13 14:53:09 +02:00
David Négrier 877a47e2dd Fixing Dockerfile build path 2020-04-13 14:46:45 +02:00
gparant 01dbff7aee Merge branch 'interaction' into kharhamel-interaction 
# Conflicts:
#	front/src/Phaser/Game/CameraManager.ts
#	front/src/Phaser/Game/GameScene.ts
#	front/src/Phaser/Game/MapManager.ts
#	front/src/Phaser/Player/Player.ts
 2020-04-13 13:42:21 +02:00
kharhamel c51f5f4aa9 added som ebasic speech bubbles 2020-04-12 19:35:51 +02:00
kharhamel 05379c8001 the other playes now run away from the player on contact 2020-04-12 19:06:31 +02:00
kharhamel 97a55ab66c fixed the player animations 2020-04-12 18:28:05 +02:00
kharhamel d1106d757d made the player pushable by other models 2020-04-12 17:13:33 +02:00
kharhamel 2b2b615e7b added other players models and fixed collision with other entities 2020-04-12 17:08:28 +02:00
kharhamel 6e27377b07 rewrote the app code to more easily allow for collisions 2020-04-12 16:12:08 +02:00
David Négrier 62dd34b591 Triggerring CI rerun 2020-04-12 15:50:14 +02:00