|
|
bace2c6281
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2021-01-25 19:39:28 +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 |
|
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 |
|
|
|
cfaf7aaf60
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2021-01-20 19:41:05 +01:00 |
|
David Négrier
|
adca51f6de
|
Replacing FourOFourScene with more generic ErrorScene
|
2021-01-17 20:42:45 +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 |
|
|
|
f16c7d9d3c
|
Merge remote-tracking branch 'upstream/master' into develop
|
2021-01-13 22:29:22 +01:00 |
|
kharhamel
|
472fbb1de0
|
All player textures are now lazy-loaded
|
2021-01-08 11:44:41 +01:00 |
|
|
|
92ce52cdb3
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2021-01-07 14:17:36 +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 |
|
|
|
45ab174dab
|
Fix typo
|
2021-01-06 15:35:09 +01:00 |
|
kharhamel
|
1359fbe977
|
updated phaser to version 3.51 and fixed the BC
|
2021-01-06 15:00:54 +01:00 |
|
|
|
4242abcc52
|
Added button to show the copyright info of the map
|
2021-01-06 02:27:48 +01:00 |
|
|
|
030e3b324d
|
Fixed animation by appling another PR
https://github.com/thecodingmachine/workadventure/pull/443/
|
2021-01-05 21:04:57 +01:00 |
|
|
|
7797df539f
|
Fixed syntax error and commited yarn.lock
|
2021-01-05 19:13:34 +01:00 |
|
|
|
88a5fe4664
|
Added animation function as in PR
https://github.com/thecodingmachine/workadventure/pull/542
|
2021-01-05 18:59:51 +01:00 |
|
Piotr Dobrowolski
|
28d687e338
|
front: implement map sounds
|
2021-01-04 16:57:31 +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 |
|
kharhamel
|
eb88db92be
|
FIX: going back a 2nd time to SelectCharacterScene used to crash the game
|
2020-12-16 15:09:58 +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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
