Commit Graph

2830 Commits

Author SHA1 Message Date
Gregoire Parant 4b4356e7ff Merge branch 'master' into develop 2021-07-28 12:37:14 +02:00
_Bastler 3c52bb3dd4 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-28 08:25:52 +02:00
grégoire parant 3d657b4a18 HotFix ban user (#1318)
* HotFix ban user

 - Fix to permit to ban user with more sub tab openned
 - Fix to permit to send message ban to the user with more sub tab oppened

* Fix CI

* Run pretty
2021-07-27 14:42:32 +02:00
Stefan Weil 64065b2798 Fix some typos (found by codespell) (#1316)
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2021-07-27 14:29:09 +02:00
GRL78 95af568653 Link will now be white and underline + Click on the game to lose focus of input field (#1315)
* Link will now be white and underline
Click on the game to lose focus of input field

* Use bind:this instead of querySelector
Add isClickedInside and isClickedOutside to HtmlUtils to know if the user click inside/outside an element targeted
2021-07-27 14:28:35 +02:00
grégoire parant fc9865e273 HotFix position WOKA (#1317)
- Fix the moving position when a user enters in "custom your own" with custom WOKA loaded from admin
2021-07-27 14:28:00 +02:00
David Négrier cdd61bdb2c Merging with develop 2021-07-23 16:41:38 +02:00
GRL 9e8bed7aab Position of quill tooltip
Use inlineStyle to indent and align text correctly
2021-07-23 16:17:53 +02:00
David Négrier 3d5c222957 Reverting changes regarding single quotes 2021-07-23 14:59:56 +02:00
David Négrier a146065cc6 Reverting changes regarding single quotes 2021-07-23 14:55:14 +02:00
GRL ba6e6235d6 Merge branch 'develop' of github.com:thecodingmachine/workadventure into GlobalMessageToWorld 2021-07-23 14:10:43 +02:00
_Bastler 1f36069461 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-23 12:57:58 +02:00
David Négrier 5a56c20221 Merge pull request #1310 from thecodingmachine/fix_persist_property
Taking into account persist property
2021-07-23 12:27:08 +02:00
David Négrier c1cd464a7b Fixing reference to deprecated method in doc 2021-07-23 12:26:18 +02:00
David Négrier 88f2bfdf39 Taking into account persist property
The "persist" property was not taken into account and all variables were stored in DB. This change makes sure only variables tagged with "persist" are actually persisted.
2021-07-23 12:19:47 +02:00
_Bastler 07b3dc0f5e Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-23 12:18:30 +02:00
David Négrier 72a9f901ab Merge pull request #1309 from thecodingmachine/fix_variable_loops
Fixing loop when setting variables
2021-07-23 11:57:06 +02:00
David Négrier 2aba6b1c27 Fixing loop when setting variables
Setting a variable would makes the application enter in an infinite loop of events (between all the scripts and the back)
This fix makes sure a variable does not emit any event if it is changed to a value it already has.
2021-07-23 11:51:01 +02:00
GRL 807abaa2c0 Text global message use delta instead of text 2021-07-23 11:07:17 +02:00
_Bastler b6693b9ea7 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-22 18:41:01 +02:00
GRL a0aeb3b1f8 Merge remote-tracking branch 'origin/GlobalMessageToWorld' into GlobalMessageToWorld 2021-07-22 17:29:16 +02:00
GRL 9fa7c7aac0 Merge branch 'develop' of github.com:thecodingmachine/workadventure into GlobalMessageToWorld 2021-07-22 17:29:00 +02:00
GRL a01bd73e93 Merge branch 'develop' of github.com:thecodingmachine/workadventure into GlobalMessageToWorld 2021-07-22 17:17:25 +02:00
David Négrier 84df25f863 Improving WA.state typings 2021-07-22 17:14:36 +02:00
David Négrier 756a495ac6 Fixing CI 2021-07-22 17:14:15 +02:00
GRL 68ff1b9e17 Merge branch 'develop' of github.com:thecodingmachine/workadventure into GlobalMessageToWorld 2021-07-22 16:26:01 +02:00
GRL 9e16bfc366 playGlobalMessage are receive as adminRoomMessage
Suppression of GlobalMessageManager and TypeMessage
Migrating message to svelte
2021-07-22 16:14:27 +02:00
_Bastler b3b99d1a55 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-22 14:53:32 +02:00
David Négrier 9b2914cc63 Merge pull request #1239 from thecodingmachine/scripting_api_room_metadata
Allowing loading/saving "metadata" from a room
2021-07-22 11:28:12 +02:00
David Négrier 31811ab906 Improve docblock 2021-07-22 11:24:30 +02:00
David Négrier ae5617f3a0 Simplifying promises 2021-07-22 10:41:45 +02:00
David Négrier 6d4c2cfd39 Simplifying error handling 2021-07-22 10:33:07 +02:00
_Bastler 39561b315c Twemoji Picker 2021-07-21 18:54:43 +02:00
_Bastler 3ccc471d2f Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-21 18:53:05 +02:00
David Négrier ddabda1c4b Adding error case in test 2021-07-21 18:49:25 +02:00
David Négrier 1435ec89c9 Adding unit test and fixing an issue with DNS solving 2021-07-21 18:42:20 +02:00
David Négrier 1bb6d893e0 Simplifying promises 2021-07-21 18:23:03 +02:00
David Négrier 3cfb74be54 Removing useless console log 2021-07-21 16:55:34 +02:00
David Négrier 8790a9c680 Merge pull request #1303 from ValdoTR/develop
Fix openPopup deprecated annotation
2021-07-21 16:43:03 +02:00
David Négrier 080d495044 Renaming WA.room.getMap to WA.room.getTiledMap 2021-07-21 16:40:53 +02:00
David Négrier 181545e6b7 Removing dead code 2021-07-21 16:33:56 +02:00
David Négrier aa19e8a7cd Adding a warning when editing a map locally. 2021-07-21 16:29:38 +02:00
Valdo Romao cd49fd5b83 Fixe openPopup deprecated annotation 2021-07-21 16:10:30 +02:00
David Négrier f435cecfdc Merge branch 'develop' of github.com:thecodingmachine/workadventure into scripting_api_room_metadata 2021-07-21 15:37:53 +02:00
_Bastler 28583ad9c0 update chat 2021-07-20 21:17:54 +02:00
_Bastler c9b3835f99 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-07-20 20:31:01 +02:00
GRL78 4f513fb1e0 Fix test Scripting API (#1298)
* fix tests of Scripting API

* Suppression ts-ignore
2021-07-20 19:54:45 +02:00
David Négrier 78524e64bd Merge pull request #1300 from thecodingmachine/remove_search_args_from_room_url
Removing the 'search' parameters from the room URL sent to pusher
2021-07-20 18:42:18 +02:00
David Négrier 2d55f982d3 Removing the 'search' parameters from the room URL sent to pusher 2021-07-20 18:29:41 +02:00
grégoire parant b336e3b08a Delete logo TCM on Error scene (#1297) 2021-07-20 16:45:24 +02:00