Gregoire Parant
|
ed8232b0f5
|
Fix style menu
|
2020-12-17 21:58:18 +01:00 |
|
|
Gregoire Parant
|
e77eb6d5be
|
Typo fixes
|
2020-12-17 18:19:47 +01:00 |
|
David Négrier
|
055131ac66
|
Typo fixes
|
2020-12-17 15:20:42 +01:00 |
|
|
Gregoire Parant
|
faf32bfa01
|
Fix event click listner
|
2020-12-17 14:16:10 +01:00 |
|
|
Gregoire Parant
|
2d4193a917
|
Merge branch 'develop' into notifOutSound
|
2020-12-17 13:56:21 +01:00 |
|
kharhamel
|
9fbcf0dc12
|
FIX: spark button open in a new window
|
2020-12-16 19:02:10 +01:00 |
|
|
Gregoire Parant
|
a2d56ef56a
|
Update admin menu
|
2020-12-16 18:52:11 +01:00 |
|
|
Gregoire Parant
|
1a27b7d2ee
|
Update menu
|
2020-12-16 17:17:31 +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
|
f5e77ad749
|
FIX: menu flicker
|
2020-12-16 12:49:34 +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 |
|
Kharhamel
|
57a59cba8e
|
Merge pull request #473 from thecodingmachine/master
hotfixes from master
|
2020-12-03 18:48:43 +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 |
|
|
kharhamel
|
1971d26dc0
|
FIX: couldn't access to an anonymous private map
|
2020-12-01 19:34:36 +01:00 |
|
|
Kharhamel
|
5f372e485d
|
Merge pull request #468 from thecodingmachine/master
hotfixes from master
|
2020-11-30 13:49:35 +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
|
17e633ae45
|
Merge pull request #442 from cbluoss/develop
Adding more clothing options
|
2020-11-26 10:30:54 +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 |
|
yourcoke
|
8ff24c38b0
|
added: engelbert hose + mask
|
2020-11-24 20:23:20 +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 |
|
|
yourcoke
|
bbd3d9efae
|
added: hoodies
|
2020-11-21 15:46:04 +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 |
|
|
yourcoke
|
f5e41cc285
|
added: pride shirt
|
2020-11-20 15:56:58 +01:00 |
|
|
yourcoke
|
62f13f6b30
|
added: mate bottle accessorie
|
2020-11-20 11:49:08 +01:00 |
|
|
yourcoke
|
a6c8132f0a
|
added: tinfoil hat1
|
2020-11-20 10:59:22 +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 |
|
|
Kharhamel
|
eed292b707
|
Merge pull request #428 from thecodingmachine/master
Hotfixes from master
|
2020-11-17 15:26:11 +01:00 |
|
|
kharhamel
|
b6b76cbfaf
|
FIX: creating an exit to the current map should not cause a crash anymore
|
2020-11-17 15:02:21 +01:00 |
|
|
Gregoire Parant
|
1570ef9663
|
Merge branch 'develop' into windows-focus-blur-camera
# Conflicts:
# front/src/Phaser/Game/GameScene.ts
|
2020-11-16 15:46:52 +01:00 |
|
|
Gregoire Parant
|
b0bd4c5f40
|
Merge remote-tracking branch 'github.com/develop' into feature-discussion
|
2020-11-16 15:43:28 +01:00 |
|
|
David Négrier
|
c7031c7c54
|
Merge pull request #411 from thecodingmachine/fix-#314
Fix init position and trigger layers properties
|
2020-11-16 15:24:21 +01:00 |
|
|
Gregoire Parant
|
2d0fc1072f
|
Fix feedback
|
2020-11-16 15:05:51 +01:00 |
|
|
Gregoire Parant
|
73fa0ecbfc
|
Fix init position and trigger layers properties
|
2020-11-10 17:00:23 +01:00 |
|
|
Gregoire Parant
|
0acbe20bbf
|
Fix name send in message
|
2020-11-10 13:00:14 +01:00 |
|