_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,883 Commits 2 Branches 0 Tags 47 MiB
e42e1f36b4
Commit Graph

1883 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
_Bastler
e42e1f36b4 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2021-05-11 12:01:25 +02:00
David Négrier
5f6d9e060c
Merge pull request #1027 from thecodingmachine/fix_resize_helpcamera 
Fixing "camera popup" always display on resize
 2021-05-11 10:05:52 +02:00
_Bastler
5bd56d00f3 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2021-05-10 20:52:57 +02:00
David Négrier
0411d5e493 Fixing "camera popup" always display on resize 
This fixes a bug where the "camera popup" window was always displayed when the screen was resized.
 2021-05-10 19:05:01 +02:00
David Négrier
58482f8ae6 Improving Changelog 2021-05-10 19:01:29 +02:00
David Négrier
a95d592659
Merge pull request #1004 from thecodingmachine/dependabot/npm_and_yarn/back/lodash-4.17.21 
Bump lodash from 4.17.20 to 4.17.21 in /back
 2021-05-10 18:57:46 +02:00
David Négrier
4606173ed1
Merge pull request #1003 from thecodingmachine/dependabot/npm_and_yarn/messages/lodash-4.17.21 
Bump lodash from 4.17.20 to 4.17.21 in /messages
 2021-05-10 18:57:30 +02:00
David Négrier
954b87db41
Merge pull request #1002 from thecodingmachine/dependabot/npm_and_yarn/maps/lodash-4.17.21 
Bump lodash from 4.17.20 to 4.17.21 in /maps
 2021-05-10 18:57:16 +02:00
David Négrier
cd8501d80e
Merge pull request #1001 from thecodingmachine/dependabot/npm_and_yarn/uploader/lodash-4.17.21 
Bump lodash from 4.17.20 to 4.17.21 in /uploader
 2021-05-10 18:57:04 +02:00
David Négrier
d2bab4e7ef
Merge pull request #1017 from thecodingmachine/change_xxxplayercontrol_name 
Renaming restorePlayerControls/disablePlayerControls
 2021-05-10 12:35:34 +02:00
David Négrier
c025d1798b Renaming restorePlayerControls/disablePlayerControls 
Putting "controls" in the plural form:

- restorePlayerControl => restorePlayerControls
- disablePlayerControl => disablePlayerControls
 2021-05-10 12:18:06 +02:00
David Négrier
3a82481d70 Merge branch 'master' of github.com:thecodingmachine/workadventure into develop 2021-05-10 12:10:57 +02:00
David Négrier
c1da898c59
Merge pull request #1015 from thecodingmachine/markdown_doc 
Splitting scripting API doc in 2
 2021-05-10 12:09:20 +02:00
David Négrier
293c57568e Splitting scripting API doc in 2 
Splitting scripting API doc in 2 docs:

- scripting.md: contains the explaination on how to enable scripting
- api-reference.md: contains the list of all available functions
 2021-05-10 12:08:52 +02:00
Kharhamel
8cb32c34b5
Merge pull request #1014 from thecodingmachine/fixStagingBuild 
added back automatic deploy of staging
 2021-05-10 12:03:23 +02:00
kharhamel
9a8b10bbf5 added back automatic deploy of staging 2021-05-10 11:56:08 +02:00
David Négrier
945ff446a9
Merge pull request #1012 from thecodingmachine/markdown_doc 
Adding Markdown documentation relative to scripting
 2021-05-10 10:56:43 +02:00
David Négrier
e0ac8abd51
Merge pull request #1011 from thecodingmachine/markdown_doc 
Adding Markdown documentation relative to scripting
 2021-05-10 10:54:16 +02:00
David Négrier
bc88a7d3ed Adding Markdown documentation relative to scripting 2021-05-10 10:47:55 +02:00
_Bastler
2234abb8b9 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2021-05-10 10:10:58 +02:00
David Négrier
44eb25e9f6
Merge pull request #1006 from jonnytest1/typed-api-events 
Typed api events
 2021-05-10 09:13:49 +02:00
jonny
91148035ec polyfill generic message event 2021-05-09 21:46:40 +02:00
jonny
cf06f29ef8 fixed cherry pick conflicts 2021-05-09 21:38:11 +02:00
jonny
8da5bf9f8e typed iframe api events 
# Conflicts:
#	front/src/Api/IframeListener.ts
#	front/src/iframe_api.ts
 2021-05-09 21:36:48 +02:00
_Bastler
deac58ebc7 merge into develop 2021-05-08 20:05:08 +02:00
dependabot[bot]
b141da1475
Bump lodash from 4.17.20 to 4.17.21 in /back 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-07 13:45:33 +00:00
dependabot[bot]
543397efe4
Bump lodash from 4.17.20 to 4.17.21 in /messages 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-07 13:45:29 +00:00
dependabot[bot]
9c620de649
Bump lodash from 4.17.20 to 4.17.21 in /maps 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-07 13:45:25 +00:00
dependabot[bot]
3a00ecab8f
Bump lodash from 4.17.20 to 4.17.21 in /uploader 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-07 13:44:51 +00:00
David Négrier
5605e63e5f
Merge pull request #998 from thecodingmachine/skiprender2 
Skip "render" if nothing changed on screen (2)
 2021-05-07 15:44:08 +02:00
Gregoire Parant
62a6eabc88 Merge branch 'master' into develop 2021-05-07 00:07:43 +02:00
grégoire parant
0e32238505
HotFix custom WOKA (#999) 2021-05-06 19:58:08 +02:00
David Négrier
66490c9083 Adding test map to test energy consumption 2021-05-06 16:31:39 +02:00
David Négrier
6b4d064f19 Merge branch 'develop' of github.com:thecodingmachine/workadventure into skiprender2 
# Conflicts:
#	front/src/Phaser/Game/GameScene.ts
#	front/src/index.ts
 2021-05-06 16:25:13 +02:00
David Négrier
189dba2e21 Fixing memory leak when switching scenes 2021-05-06 15:38:24 +02:00
David Négrier
3b5f105daf Setting the dirty state automatically when there is an animation frame 2021-05-06 15:38:22 +02:00
David Négrier
6d3cbc573c Instruct systems with 2 GPUs to use the low power GPU (to save battery) 2021-05-06 15:36:49 +02:00
David Négrier
0c5e5ef578 Skip "render" if nothing changed on screen 
For each requested animation frame (RAF) in Phaser, Phaser calls the "update" method, then the "render" method of each scenes.
The "render" method takes some time (and energy) to perform the rendering.

The fact is we probably don't need to call "render" if nothing changed on the screen (which happens most of the frames in a typical WorkAdventure game).

This commit is therefore overloading the "Game" class of Phaser to add a "dirty" flag.

Scenes can now add a "isDirty()" method. If all displayed scenes are pristine (not dirty), Phaser will skip rendering the frame altogether.

This saves "a lot" of energy, resulting in laptops that are not overheating when using WorkAdventure \o/
 2021-05-06 15:36:45 +02:00
David Négrier
271300aa8d
Merge pull request #982 from jonnytest1/baseUrlFix 
fixed url cannot be relative
 2021-05-06 15:09:13 +02:00
Gregoire Parant
1440faf825 Merge branch 'master' into develop 2021-05-06 00:57:55 +02:00
grégoire parant
46978d26f9
Add entry map village WorkAdventure (#997) 2021-05-06 00:53:04 +02:00
jonny
a24ca078e6 use iframe url if no script 
# Conflicts:
#	front/src/Api/IframeListener.ts
 2021-05-05 19:15:32 +02:00
David Négrier
fea1de36a4
Merge pull request #974 from tabascoeye/patch-1 
allow numbers in nickname again
 2021-05-05 18:44:01 +02:00
David Négrier
f085393730
Merge pull request #992 from tabascoeye/patch-2 
getting rid of special char in filename
 2021-05-05 18:34:46 +02:00
David Négrier
77d14ee7ce
Merge pull request #994 from thecodingmachine/resolution 
Improving centering of HTML elements in setup scenes
 2021-05-05 18:33:49 +02:00
David Négrier
989528f729 Updating changelog 2021-05-05 17:14:28 +02:00
David Négrier
3751b0e2bc Removing RESOLUTION and ZOOM_LEVEL settings: they are no more needed or supported 2021-05-05 17:11:03 +02:00
David Négrier
7ae66a63a4 Refactoring centering of DOM elements 2021-05-05 17:10:39 +02:00
David Négrier
9c4a0245a3
Merge pull request #924 from thecodingmachine/resolution 
Improving mobile rendering / adding zoom / pinch
 2021-05-05 16:21:13 +02:00
David Négrier
c1be97e366 Adding test cases for mobile 2021-05-05 16:18:37 +02:00