DESKTOP-FMM8UI0\CLV
b9d9a78868
Link changed in Tutov3
...
Change position of cam and buttons share/cam/Mic
2021-04-19 14:42:49 +02:00
DESKTOP-FMM8UI0\CLV
d31021c02d
Replace share screen logo
2021-04-19 14:19:16 +02:00
Gregoire Parant
a42e873f64
Merge branch 'master' into develop
2021-04-14 20:11:41 +02:00
_Bastler
df29fa4d96
merge develop
2021-04-13 15:40:02 +02:00
_Bastler
64a3731bfb
merge dev, apply partey changes
2021-04-13 15:21:21 +02:00
Gregoire Parant
4119f69879
HotFix
...
- Key up m when user write message
- Size game share
2021-04-13 12:30:15 +02:00
kharhamel
f82551016a
FIX: in vertical mode, the coWebSite now open from the top
2021-04-13 11:34:14 +02:00
PizZaKatZe
633bdfcaff
Always enable virtual joystick
...
Keeps 'toggle fullscreen' as a separate game setting.
2021-04-13 02:00:06 +02:00
PizZaKatZe
c3230bc2b3
Integrate virtual joystick
2021-04-13 02:00:03 +02:00
Gregoire Parant
4fc9a12b95
HotFix style WorkAdventure
2021-04-12 18:17:04 +02:00
Johannes Berthel
6ee4889773
added change companion button to menu
2021-04-02 23:13:03 +02:00
kharhamel
a30923ceae
FEATURE: improved the fullscreen and close buttons to be in the aside element
2021-03-31 18:39:51 +02:00
David Négrier
aaaa192b71
Merge branch 'develop' of github.com:thecodingmachine/workadventure into iframe_api
...
# Conflicts:
# front/dist/.gitignore
# front/dist/index.tmpl.html
# front/src/Phaser/Game/GameScene.ts
# front/src/WebRtc/CoWebsiteManager.ts
2021-03-28 16:53:15 +02:00
Valdo Romao
f7c4592944
Updated favicons
2021-03-24 23:10:02 +00:00
Kharhamel
ec2fa9501c
Merge pull request #813 from thecodingmachine/warningMessage
...
Warning message
2021-03-24 14:27:13 +01:00
kharhamel
8d6c1a50bf
FEATURE: warning message when world is near full capacity
2021-03-23 17:44:47 +01:00
PizZaKatZe
821f91e996
Finer steps for audio volume
2021-03-22 20:10:27 +01:00
PizZaKatZe
132c6c9ad6
Fix volume auto-reduction in conversations
2021-03-22 20:09:09 +01:00
PizZaKatZe
20d3236e73
Fix audio control box appearance
2021-03-22 20:06:55 +01:00
DESKTOP-FMM8UI0\CLV
3ef3561b57
no message
2021-03-22 16:10:21 +01:00
PizZaKatZe
c0bf5755ed
front: Fix page template
2021-03-21 11:28:02 +01:00
PizZaKatZe
97ec721c2a
front: Fix page template indentation
2021-03-21 11:28:02 +01:00
GRL
e50c8bc354
Suppression of *{...} in every HTML files because the style.ccs file already declare it.
...
Suppression unused code
2021-03-19 16:21:35 +01:00
GRL
0eb16bce6f
Suppression width in Html file
2021-03-19 15:58:02 +01:00
GRL
1cfb22f695
Creation of the HelpCameraSettingsScene
...
Update of GameManager and index to include the new scene
Change title of helpCameraSettings
Suppression function reset
2021-03-19 15:40:07 +01:00
GRL
c654f722e3
Add Firefox image
...
Check permissions in the game
Button Continue to continue without allowing camera and microphone
2021-03-19 12:04:37 +01:00
Gregoire Parant
d68406d5e1
Create input need page
2021-03-19 12:02:42 +01:00
kharhamel
32fdfaab35
edited CoWebsiteManager to manage vertical resizing
2021-03-18 16:11:22 +01:00
kharhamel
0701e607fa
added sass loader to the project and put the cowebsite style in its own sass file
2021-03-18 12:37:05 +01:00
kharhamel
f9c8b4131c
added fullscreen
2021-03-17 18:57:00 +01:00
kharhamel
272be3eba0
improve the visual of the cowebsite
2021-03-17 18:35:19 +01:00
kharhamel
3f6c61633a
FEATURE: complete control over the iframe size
2021-03-17 18:34:12 +01:00
Kharhamel
19856c0ee9
Merge pull request #783 from Moini/patch-1
...
Improve visibility of close button for embedded web pages
2021-03-17 14:35:11 +01:00
David Négrier
ed2ce68f37
Merge branch 'FTUEPopup' of github.com:ClementVieilly75/workadventure into iframe_api
...
# Conflicts:
# front/dist/.gitignore
# front/src/Phaser/Game/GameScene.ts
2021-03-09 15:35:51 +01:00
DESKTOP-FMM8UI0\CLV
bbf5003e16
move font press start 2P from index.html to style.css
2021-03-09 14:21:11 +01:00
DESKTOP-FMM8UI0\CLV
b175b7164d
Merge branch 'develop' of https://github.com/thecodingmachine/workadventure into FTUEPopup
...
* 'develop' of https://github.com/thecodingmachine/workadventure :
Trying to enable back connection on admin from develop, knowing that the develop certificate is broken. Fixing priority.
Trying to enable back connection on admin from develop, knowing that the develop certificate is broken
Revert "Adding back admin in develop branch CI"
Adding back admin in develop branch CI
Fixing GA tag not included in play domain
FEATURE: better implementation of the admin global message
Fix ci
Update private access
Allow URLs relative to map base in iframe / openWebsite
# Conflicts:
# front/src/Phaser/Game/GameScene.ts
2021-03-09 13:57:05 +01:00
DESKTOP-FMM8UI0\CLV
858bf0b384
Adding property tile "inGameConsoleMessage", open a popup when user walk on a tile with this property
...
Adding map "Tuto2", the FTUE map
2021-03-08 09:28:15 +01:00
David Négrier
6fbf165c91
Adding the ability to register a single script using the "script" attribute at the map property level.
2021-03-07 21:02:38 +01:00
David Négrier
15405633d1
Fixing GA tag not included in play domain
...
The GA tag was not properly included because the index.html file that contained it was overwritten by Webpack's HtmlWebpackPlugin.
2021-03-05 10:00:11 +01:00
David Négrier
eb93a04341
Adding an API for inter-iframe communication
...
Adds a first version of an API to communicate between an iFrame opened by WorkAdventure and WorkAdventure itself.
The first API method is a method allowing to add messages in the chat, from the iFrame.
Comes with a test file.
2021-03-04 19:00:00 +01:00
Moini
95da470a89
Improve visibility of close button for embedded web pages
...
The button (a white x) wasn't visible on white background. Now it is. Also is a little bit larger and changes color on hover.
2021-03-01 14:08:56 +01:00
David Négrier
6e9c715980
Merge pull request #739 from t10r/fix/multi-user-videochat-mode
...
fix multi user videochat mode
2021-02-19 14:54:38 +01:00
David Négrier
e07efbdf28
Merge pull request #698 from thecodingmachine/fix/deploy-cleanup
...
Adding docker-compose.prod.yaml to ease deployment
2021-02-16 10:35:18 +01:00
Tim Schlüter
05b829da70
fix multi user videochat mode
2021-02-13 21:19:45 +01:00
kharhamel
0c892e0243
FEATURE: implemented a client side blacklist
2021-02-12 19:15:24 +01:00
David Négrier
adb535d1b6
Merge pull request #703 from thecodingmachine/socialNetworkLink
...
Social network link anonymous connexion
2021-02-04 16:10:25 +01:00
Gregoire Parant
59b4b168e9
Social network link anonymous connexion
...
In menu, add social newtork link when user is connected in anonymous mode
2021-02-03 23:14:31 +01:00
Gregoire Parant
4de9b8ba40
Fix icon discussion
...
- Fix size of discussion icon
- Update x and y when page is resize
- Fix blanc link in chat
2021-02-03 23:11:33 +01:00
grégoire parant
f2b9f6c92a
Merge pull request #686 from thecodingmachine/publicReportedUser
...
Permit puiblic report
2021-02-02 18:09:25 +01:00
David Négrier
8572959cb0
Merge pull request #690 from thecodingmachine/newLogo
...
Update Loading page
2021-02-02 17:26:48 +01:00
David Négrier
274f5eba4c
Reworking docker-compose.prod.yaml to make it generic while still having a front container configurable
2021-02-02 11:19:24 +01:00
Manfred Stock
0afbb5412e
Improve display of websites not specifying background color
...
The `index.html` of the front-end specifies `#000` as background color,
however, it seems like various websites found 'in the wild' don't
specify their own background color and thus default to `transparent`. As
a result of this, they tend to become mostly unreadable when displayed
using `openWebsite` since they often assume that they get displayed on a
white background. Setting white as background color on the container
element of the `<iframe>` works around this issue.
2021-02-01 22:48:10 +01:00
Gregoire Parant
f99db4856f
Add WorkAdventure logo
2021-01-30 20:33:31 +01:00
Gregoire Parant
ac2bc76239
change style report button
2021-01-30 14:08:11 +01:00
Gregoire Parant
7eb38fae83
Permit puiblic report
...
- Create report html
- Add report flag
2021-01-29 21:09:10 +01:00
Gregoire Parant
0133609770
clean
2021-01-24 16:06:52 +01:00
Jean-Philippe Evrard
e2f400472f
Template google analytics data
...
Without this patch, the index.html contains google analytics at
all times, including for people self-hosting it.
This is a problem for privacy reasons, and only people wanting
to have analytics on their instances should be able to enable
them.
This fixes it by making sure the index.html page is templated
to sideload content from ANALYTICS_CODE_PATH (which itself is
also templated, for convenience).
2021-01-19 12:17:05 +01:00
Gregoire Parant
4397ff7712
Update style and focus keyboard
2021-01-06 13:36:18 +01:00
David Négrier
dea7d6dba7
Merge pull request #541 from Informatic/feature/map-sounds
...
[rC3] front: implement map sounds
2021-01-05 13:42:50 +01:00
Gregoire Parant
ac92cbc8f7
Crate share menu and fix menu design
2021-01-04 17:13:41 +01:00
Piotr Dobrowolski
28d687e338
front: implement map sounds
2021-01-04 16:57:31 +01:00
Gregoire Parant
89064d23f9
Fix style
2020-12-18 00:09:07 +01:00
Gregoire Parant
ed214f2b41
Fix style menu
2020-12-17 22:10:36 +01:00
Gregoire Parant
ed8232b0f5
Fix style menu
2020-12-17 21:58:18 +01:00
David Négrier
055131ac66
Typo fixes
2020-12-17 15:20:42 +01:00
Gregoire Parant
2d4193a917
Merge branch 'develop' into notifOutSound
2020-12-17 13:56:21 +01:00
Gregoire Parant
6a21436c9e
Update menu
2020-12-16 18:56:02 +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
Gregoire Parant
af89965db8
Fix style button
2020-12-16 16:32:28 +01:00
Kharhamel
c93d1794b7
Merge pull request #496 from thecodingmachine/fixSkinChangeCrash
...
FIX: going back a 2nd time to SelectCharacterScene used to crash the game
2020-12-16 15:25:36 +01:00
Gregoire Parant
8bf72e1ffd
Change out notification sound
2020-12-16 15:10:46 +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
1f3c738cd0
Merge pull request #491 from thecodingmachine/updateStyleCss
...
update pointer style
2020-12-16 12:58:37 +01:00
kharhamel
f5e77ad749
FIX: menu flicker
2020-12-16 12:49:34 +01:00
Gregoire Parant
bb8980e1d2
update pointer style
2020-12-15 17:34:47 +01:00
Gregoire Parant
8947e1b781
update pointer style
2020-12-15 17:31:55 +01:00
kharhamel
069f2f1cec
FEAT: prototype game menu using html elements, better icon for text chat
2020-12-15 16:37:57 +01:00
kharhamel
a1aedaa594
FEAT: now play a sound when a user quit the webrtc group
2020-12-11 16:01:31 +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
Kharhamel
17e633ae45
Merge pull request #442 from cbluoss/develop
...
Adding more clothing options
2020-11-26 10:30:54 +01:00
yourcoke
8ff24c38b0
added: engelbert hose + mask
2020-11-24 20:23:20 +01:00
Gregoire Parant
2812387650
Merge branch 'develop' into action-button
2020-11-23 20:08:19 +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
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
0a7063a478
Add close button
2020-11-17 18:03:44 +01:00
Gregoire Parant
3333b3cee3
Fix feedback moufmouf
2020-11-10 12:38:32 +01:00
Gregoire Parant
74de2746c2
Create action button
2020-10-31 14:04:55 +01:00
Gregoire Parant
a2dd3bd6ab
Fix style
2020-10-30 20:35:45 +01:00
Gregoire Parant
724bb7f288
Merge branch 'develop' into feature-discussion
2020-10-30 20:04:12 +01:00
Gregoire Parant
80355e6b85
fix layout mode click when discussion is activated
2020-10-27 20:46:53 +01:00
Gregoire Parant
55c1bcee66
Add callback report in discussion part
2020-10-27 20:18:25 +01:00
Kharhamel
dfd2b2048c
Merge pull request #380 from thecodingmachine/jitsiQOL
...
opening and closing jitsi windows now trigger some transitions
2020-10-27 17:57:56 +01:00
kharhamel
67aa2f4b6c
opening and closing jitsi windows now trigger some transitions
2020-10-27 17:44:57 +01:00
Gregoire Parant
850be63284
Fix style
2020-10-26 00:26:10 +01:00
Gregoire Parant
1e096af43b
Fix font family
2020-10-26 00:03:30 +01:00
Gregoire Parant
bdb504722f
Fix style -webkit-focus
2020-10-25 22:41:31 +01:00
Gregoire Parant
1945c24704
Create send data discussion
2020-10-25 21:59:14 +01:00
Gregoire Parant
f344adc48b
Create discussion
...
- Add new discussion class
- Feature to discuss and report user
2020-10-25 19:39:15 +01:00
Gregoire Parant
b6fe9e72e1
Fix style and refactor
2020-10-25 19:38:00 +01:00
Gregoire Parant
e640f67156
update admin navbar
2020-10-24 13:37:33 +02:00
Gregoire Parant
bf9dfcc835
Ban mesage
...
- Create type message could be use to send private message at any user
- Create SendMessageUser message
- Add sound when user receive ban message
2020-10-19 19:32:47 +02:00
Gregoire Parant
62dfb68aaf
Update style report modal
2020-10-15 12:24:16 +02:00
Gregoire Parant
4799460064
Merge branch 'develop' into player-report
...
# Conflicts:
# front/src/Connexion/RoomConnection.ts
2020-10-14 15:06:10 +02:00
David Négrier
807ccc49d4
Fixing rewriterule with register link in prod
2020-10-14 13:52:02 +02:00
David Négrier
b7340022de
Fixing rewriterule with @ in prod
2020-10-14 13:29:16 +02:00
Gregoire Parant
436cde7033
Fixe style media manager and text modale
2020-10-13 21:54:08 +02:00
Gregoire Parant
05a1ea8469
Merge branch 'develop' into player-report
...
# Conflicts:
# back/src/Controller/IoSocketController.ts
# front/src/Phaser/Game/GameScene.ts
# front/src/index.ts
# messages/messages.proto
2020-10-13 20:39:29 +02:00
Gregoire Parant
dbaf44e814
Change report flag
...
- Add icon on video
- Permit to have a modal with comment
2020-10-13 19:56:42 +02:00
David Négrier
9a04836215
Dynamically import Quill
...
We load Quill only if it is needed (after all, only admins need Quill)
2020-10-13 10:26:27 +02:00
Gregoire Parant
c63fb6ed6f
Add image to report and to teleport player
2020-10-06 23:56:27 +02:00
David Négrier
9563013f48
Removing useless file
2020-10-01 16:02:45 +02:00
Gregoire Parant
d5fdb9d857
Fix style
2020-09-23 18:07:31 +02:00
Gregoire Parant
8c43c67741
Create feature to send and read audio message
2020-09-21 15:00:39 +02:00
Gregoire Parant
16b3e48711
Add menu to switch
2020-09-21 01:16:10 +02:00
Gregoire Parant
e0ae79eaf1
Fini quill box
2020-09-21 00:34:25 +02:00
Gregoire Parant
9b955ebd20
fix style quill box
2020-09-20 19:31:24 +02:00
Gregoire Parant
45ad4bbb36
Send and play audio message
2020-09-20 17:12:27 +02:00
Gregoire Parant
4c7e458e52
create event and brodcast event in backend
2020-09-19 01:08:56 +02:00
Gregoire Parant
e59cbcfaa7
Create console global message
...
- Add style
- Create zone and button to show the admin console
2020-09-16 21:50:04 +02:00
Gregoire Parant
509196785b
Initialise global message
...
- Create new class to manager global message. My idea is that this class permit to manage audio or text message.
- Update html to have main content id and inject html in this.
- Create front event to receive startMessage and stopMessage.
- Delete impoted variable not used.
2020-09-16 18:38:50 +02:00
David Négrier
3a9196fb82
Merge
2020-09-16 11:41:03 +02:00
David Négrier
9516f6615c
Centering character based on game div
...
Previously, character was centered based on window size, but when doing CoWebsite browsing, window size != game size, leading to poorly centered characters
2020-08-31 17:56:11 +02:00
David Négrier
13272968cf
Clicking on a video puts it in presentation mode
...
Adding the ability to put a video in presentation mode by clicking on it.
Also, adding small CSS animations on hover.
2020-08-27 10:16:34 +02:00
David Négrier
fca93663b4
Merge branch 'develop' of github.com:thecodingmachine/workadventure into outline
2020-08-24 18:15:44 +02:00
David Négrier
044495cf05
Centering character in free space
...
This commit adds the ability to put the character where there is free space when a discussion is hapening (either in presentation or chat mode)
2020-08-24 14:19:36 +02:00
David Négrier
b7c2f8be7b
Adding colors for cam/mic/screen share button
...
Microphone and camera are now red when disabled.
Screen-share is green when enabled.
Also, they are now always partially visible (they were completely hidden previously until hovering in the lower right corner)
2020-08-22 15:26:40 +02:00
David Négrier
f60b02f1dc
Putting a wider onhover surface when clicking on one of the buttons to manage screen sharing or video/mic
2020-08-20 22:57:34 +02:00
David Négrier
0119534283
First version of screen-sharing that works when a user is joining a group after screen sharing begun.
2020-08-20 00:05:00 +02:00
Gregoire Parant
4b72958193
Fix peer connexion for two player with screen sharing
2020-08-17 23:56:46 +02:00
Gregoire Parant
0bbed7717a
Continue screen sharing
2020-08-17 23:39:50 +02:00
Gregoire Parant
208b91e52a
Feature screen sharing
...
- Send stream of screen sharing in peer connexion
- Add button for share your screen
2020-08-17 23:17:00 +02:00
David Négrier
6b970adc6c
Merge branch 'develop' of github.com:thecodingmachine/workadventure into outline
...
# Conflicts:
# front/src/Phaser/Game/GameScene.ts
# front/src/Phaser/Player/Player.ts
# front/src/index.ts
# front/yarn.lock
2020-08-17 22:51:37 +02:00
David Négrier
0f305b0c12
CSS cleanup
2020-08-17 21:59:26 +02:00
David Négrier
7fe2cc19c3
Adding buttons to switch mode
2020-08-17 15:20:03 +02:00
David Négrier
1509777945
Improving video CSS (work on overlay)
2020-08-16 23:45:03 +02:00
David Négrier
88c099fc13
Improving layout
...
Fixing left-right switch on all cameras (except current player camera)
2020-08-16 23:19:04 +02:00
David Négrier
0041e088a4
Fixing position of self webcam in CoWebsite mode
2020-08-13 18:28:22 +02:00
David Négrier
9f6c6e0ce1
Adding CoWebsiteManager + first working version of flex video
2020-08-13 18:21:48 +02:00
David Négrier
6d0bccc0e1
Making a nice "customize" button
2020-07-28 15:53:44 +02:00
David Perez
25abcfe202
png files
2020-07-28 11:25:19 +02:00
David Négrier
2484e4f1df
Moving maps to their own container
2020-07-23 18:43:51 +02:00
David Négrier
b3c18702bb
Adding borders, centering camera, fixing small bug on resize when no camera is enabled
2020-06-24 17:49:38 +02:00
David Négrier
253108eba0
- Making the EnableCameraScene responsive
...
- Enabling click on arrows
2020-06-24 17:29:23 +02:00
David Négrier
3de37bafed
Adding a scene to configure the webcam
2020-06-24 15:35:07 +02:00
David Négrier
dcc78786a9
Porting favicon to the "front" container
2020-06-09 09:21:24 +02:00
David Négrier
f2c9647882
Adding connecting spinner and blinking error to webrtc display
...
I put a connecting spinner around the user name when the user is connecting.
Also, if an error occurs, we will see a blinking red circle around the player name.
2020-06-06 22:49:55 +02:00
David Négrier
17250d810f
Fixing front title
2020-06-04 15:23:54 +02:00
Gregoire Parant
244f87196e
Update strategy caching bundle front js files with webpack
...
- Add HtmlWebpackPlugin to use template index html
2020-06-01 11:53:12 +02:00
gparant
787e1c463c
Media webrtcA
...
- Update peerConnexion manage
- Add muted microphone logo
- Add icon user
- Sound when user enter in room webrtc
2020-05-14 20:39:30 +02:00
gparant
ec297e3912
Auto-reconnect
2020-05-13 20:22:42 +02:00
David Négrier
a2123c092c
Fixing htaccess redirect
2020-05-13 09:29:18 +02:00
David Négrier
daa559738b
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
2020-05-12 22:38:44 +02:00
gparant
d3ff717f9e
Minor Fix overflow css style
2020-05-12 00:22:55 +02:00
gparant
f4af824cf9
Fix error mapping refresh in back & the end of this feature development
2020-05-10 23:49:08 +02:00
gparant
b983fff076
Add map 1st floor
...
Rename map to floor 0
2020-05-09 16:38:13 +02:00
gparant
59127534ac
Fix User depth
...
- Update strategy layers depth
- Add depth to manager layers positions between all users
2020-05-08 17:35:40 +02:00
gparant
8991b6f817
Add layer override
2020-05-08 13:18:34 +02:00
gparant
a87cbe4470
Personalization of DAM office
2020-05-08 12:43:02 +02:00
gparant
b65e37c468
Name of map users
...
- Add name on user
- Delete NonPlayer class not used
2020-05-03 22:24:14 +02:00
David Négrier
b260dc32b5
Merge from master
2020-05-03 18:04:01 +02:00
gparant
fb255140e5
Add feature to mute or switch off cam
2020-05-03 17:19:42 +02:00
gparant
85ab0a231f
Fix style cam
2020-05-03 14:29:45 +02:00
gparant
fdb40ec3e2
Fix webrtc multi
2020-05-02 20:46:02 +02:00
David Négrier
42ddd8b858
Changed font from text
...
Input name can only be 4 characters long
Passing name to next scene
2020-05-01 23:19:51 +02:00
gparant
e06b20fe96
Update video style and start peer connexion
2020-05-01 21:15:00 +02:00
gparant
3151113db3
Merge branch 'master' into webrtc
...
# Conflicts:
# back/src/Model/Websocket/MessageUserPosition.ts
2020-04-29 00:05:16 +02:00
gparant
8c935e8b27
Merge branch 'master' into webrtc
...
# Conflicts:
# front/src/Phaser/Game/GameManager.ts
2020-04-28 20:50:51 +02:00
David Négrier
3b9eb73929
Adding a huge collection of characters to play with
2020-04-27 22:38:21 +02:00
David Négrier
cdd18fd5ac
Merge pull request #59 from thecodingmachine/map-v0
...
Map v0: Resize chunksize from 16 to 32 pixels
2020-04-27 18:22:24 +02:00
gparant
ecdbf4269a
Merge branch 'master' into webrtc
2020-04-26 23:22:40 +02:00
gparant
b49c012319
Add button to enter un visio
2020-04-26 20:55:20 +02:00
kharhamel
d691b58d0b
basic login page with a text input and a click button
2020-04-26 17:54:56 +02:00
NIP
5b6c7a9b5f
Resize chunksize from 16 to 32 pixels
2020-04-26 11:46:00 +02:00
gparant
575054fe4f
Fix multi video
2020-04-25 20:29:03 +02:00
gparant
5b62ac39fb
Create webrtc connexion between two player
2020-04-19 19:32:38 +02:00
NIP
91dd903904
Add new map with embed tileset
2020-04-17 18:39:54 +02:00
NIP
95e51c7aa4
MERGE and add floorLayer
2020-04-16 21:55:34 +02:00
NIP
7e8283ddf0
Add floorLayer to the map
2020-04-16 21:37:31 +02:00
David Négrier
2037147d18
First working version of the office map! Yay!
2020-04-15 23:31:39 +02:00
David Négrier
8ddd4656e6
Adding automatic loading of layers
2020-04-15 23:10:12 +02:00
NIP
84f0420694
Change GameScene to import new png, change map name and add missing png files
2020-04-13 20:34:19 +02:00
NIP
7b41a9ee2f
Add tilesets
2020-04-13 19:52:25 +02:00
NIP
7f2f977a81
My first map representing TCM office grand floor without KEN office
2020-04-13 19:38:28 +02:00
kharhamel
6e27377b07
rewrote the app code to more easily allow for collisions
2020-04-12 16:12:08 +02:00
kharhamel
241cbd720a
added a rock
2020-04-11 18:17:36 +02:00
David Négrier
b10f8d9069
Loading first sprite
2020-04-05 16:20:53 +02:00
kevin
25841b51c0
ajout des logos TCM
2020-04-04 15:42:45 +02:00
David Négrier
26b8412f3c
Initial commit
2020-04-03 14:56:21 +02:00