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

1132 commits

Author SHA1 Message Date
David Négrier
b7934d9d03 Merge branch 'develop' of github.com:thecodingmachine/workadventure into functional-tile-properties 2021-06-23 10:40:59 +02:00
David Négrier
ee07f637fa
Merge pull request #1219 from thecodingmachine/rex_outline 
Putting an outline on the character name
 2021-06-22 18:14:27 +02:00
David Négrier
1ef1a1cb22 Removing useless import 2021-06-22 17:47:54 +02:00
David Négrier
f1d00aac0e
Merge pull request #1211 from thecodingmachine/adminSvelte 
Migrating ConsoleGlobalMessageManager in svelte
 2021-06-22 17:28:37 +02:00
David Négrier
dc0f3feabf Putting an outline on the character name 
In the future, we might want to put an outline on the whole character body but this is harder as the body is actually a container and so we would need to turn this container into a sprite first.
 2021-06-22 17:15:18 +02:00
David Négrier
e9dd7ebdd9 Enabling Outline back on actionable objects 
Actionable objects (still a prototype) were outlined when you walk next to them.
The OutlinePipeline was broken when moving in Phaser 3.50+.

This PR completely removes the custom OutlinePipeline and replaces it with the rexOutlinePipelinePlugin
that is provided by a third party library and that works great \o/
 2021-06-22 16:35:57 +02:00
GRL
67d4c6e271 Resolve review 2021-06-22 16:12:53 +02:00
GRL
0728d462a5 Merge branch 'develop' of github.com:thecodingmachine/workadventure into adminSvelte 2021-06-22 16:08:06 +02:00
David Négrier
bdbd19c3da
Merge pull request #1216 from thecodingmachine/feature/animated-tiles 
Add animated Tiles plugin
 2021-06-22 15:32:55 +02:00
David Négrier
eb526f5b67 Upgrading animatedtiles plugin to trigger an event when an animation occurs and setting the scene to dirty state 2021-06-22 14:21:15 +02:00
GRL
55d99b24f4 Correction form review and checks 2021-06-22 10:43:20 +02:00
GRL
0cc7ed1647 Merge branch 'develop' of github.com:thecodingmachine/workadventure into adminSvelte 2021-06-22 10:36:16 +02:00
GRL
4fedc30301 Correction form review and checks 2021-06-22 10:27:54 +02:00
GRL
da5ae02a06 Correction form review and checks 2021-06-22 10:22:49 +02:00
GRL
8a1c57c434 Correction form review and checks 2021-06-22 10:10:03 +02:00
GRL
267a0bbe4d Correction form review and checks 2021-06-22 09:49:04 +02:00
GRL
5cac4f52bc Correction form review and checks 2021-06-22 09:43:41 +02:00
kharhamel
42c0d1002f FIX: no more whitespaces in player names 2021-06-21 17:58:04 +02:00
David Négrier
e4dab5fd0d Merge branch 'develop' of github.com:thecodingmachine/workadventure into feature/animated-tiles 
# Conflicts:
#	front/package.json
#	front/tsconfig.json
#	front/yarn.lock
 2021-06-21 17:26:00 +02:00
GRL
232fd33ec8 Migrating ConsoleGlobalMessageManager in svelte 2021-06-21 17:19:27 +02:00
David Négrier
6101548d89 Fixing bug where only one chat listener can be added. 2021-06-21 13:47:07 +02:00
David Négrier
620bd1ab2c Splitting classes in separated files 2021-06-21 12:26:12 +02:00
David Négrier
9129ceede1 Improving refactoring of API following @jonnytest1 feedback 2021-06-21 11:48:39 +02:00
jonny
5bf943ce77 converted cache to constant lookup time 2021-06-20 19:14:04 +02:00
jonny
92485a02cf tileIndex setting got merged out 2021-06-19 15:46:32 +02:00
jonny
c1d9b2c9ed coverted property map to object 2021-06-19 15:41:58 +02:00
jonny
27ccdf165c fixed merge imports 2021-06-19 15:24:27 +02:00
jonny
74dda8ab69 allow properties on tiles 
# Conflicts:
#	front/src/Phaser/Game/GameMap.ts
#	front/src/Phaser/Map/ITiledMap.ts
 2021-06-19 15:23:30 +02:00
David Négrier
34dc5a0bc6 Refactoring WorkAdventureAPI. 
Simplifying a lot what was done (even if the new code is a bit less automated, it allows to list exactly the methods we want to see deprecated and to add a notification message)
 2021-06-18 17:22:56 +02:00
jonny
702f4fe4c0 converted goToRoom to typed call 2021-06-17 11:32:59 +02:00
jonny
318749e5a8 develop merge 2021-06-17 11:30:16 +02:00
David Négrier
f6554a1082 Merge branch 'develop' of github.com:thecodingmachine/workadventure into iframe-api-refactor 
# Conflicts:
#	front/src/iframe_api.ts
 2021-06-17 11:23:56 +02:00
David Négrier
e6264948b1
Merge pull request #946 from jonnytest1/load-page-api 
Load page iframe-api
 2021-06-16 18:10:10 +02:00
jonny
c1e202b7b1 renamed to goToRoom 2021-06-16 17:16:00 +02:00
David Négrier
0afdbf7040 Fixing Svelte-check errors 2021-06-15 18:34:11 +02:00
kharhamel
c559b2104b scene cleanup 2021-06-15 15:32:40 +02:00
jonny
7712bd685b fixed merge errors 2021-06-15 15:19:45 +02:00
jonny
238f333b81 Merge remote-tracking branch 'remotes/workadventure-main/develop' into load-page-api 
# Conflicts:
#	front/src/Api/Events/IframeEvent.ts
#	front/src/Api/IframeListener.ts
#	front/src/Phaser/Game/GameScene.ts
#	front/src/iframe_api.ts
 2021-06-15 15:05:49 +02:00
David Négrier
eb895ceb58
Merge pull request #1178 from thecodingmachine/touchIframeResize 
FIX: cowebsite resize now works on touchscreens
 2021-06-15 11:42:41 +02:00
GRL
09da69c24a CustomizeScene buttons use moveHorizontally and moveVertically 2021-06-15 11:16:44 +02:00
kharhamel
a5779095f8 FIX: cowebsite resize now works on touchscreens 2021-06-15 10:55:18 +02:00
GRL
b04016f30f Merge branch 'develop' of github.com:thecodingmachine/workadventure into gameSizeFix 2021-06-15 09:06:47 +02:00
David Négrier
6bca3469b6 Removing useless import 2021-06-14 18:44:20 +02:00
David Négrier
1fa03e44df Fixing size of camera on resize 
The size of the Camera after a change in zoom is only computed on the "render" step.
Therefore, we should wait the "render" step to call GameScene.onResize.

Closes #1180
 2021-06-14 18:40:58 +02:00
David Négrier
6af9b5d0fc Disable screensharing button if user refuses rights 
If the user refuses the popup to screen-share, we should switch back the button to gray.

Closes #1179
 2021-06-14 18:18:57 +02:00
David Négrier
f16514db21
Merge pull request #1177 from thecodingmachine/bugfix/1167 
Making code more robust regarding scene being null in Character class
 2021-06-14 16:54:12 +02:00
David Négrier
dcd44f283f Making code more robust regarding scene being null in Character class 
Not sure how this can happen but it does.
Closes #1167
 2021-06-14 16:40:33 +02:00
David Négrier
e3ee66527a Fixing bug slowing down the CustomizeScene a lot 
By forcing the containers to be updated only in the "update" method, we seem to be solving some bugs regarding the way sprites are handled.
There is still an issue though. Some times, for some reasons, the update list seems to be growing a lot.
The more we click the left/right arrow to choose a character, the slower it gets (but with this commit, it does not lock anymore)
 2021-06-14 16:32:09 +02:00
GRL
b239edb266 Clean code 2021-06-14 16:09:41 +02:00
GRL
281b8580cd Use window and not viewport in css for main-container 2021-06-14 15:54:22 +02:00