From 2106949767709f6ec4fd7e459ec13975a846a393 Mon Sep 17 00:00:00 2001 From: Griatch Date: Sat, 24 Oct 2020 10:54:07 +0200 Subject: [PATCH] Fix merge conflicts --- CHANGELOG.md | 7 ++++--- evennia/server/portal/webclient.py | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fdeeedaa6..af47d8e7e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,7 +22,8 @@ N identical matches instead of triggering a multi-match error. - Add `tags.has()` method for checking if an object has a tag or tags (PR by ChrisLR) - Make IP throttle use Django-based cache system for optional persistence (PR by strikaco) - +- Renamed Tutorial classes "Weapon" and "WeaponRack" to "TutorialWeapon" and + "TutorialWeaponRack" to prevent collisions with classes in mygame ### Evennia 0.9.5 (master) - `is_typeclass(obj (Object), exact (bool))` now defaults to exact=False @@ -98,8 +99,8 @@ without arguments starts a full interactive Python console. - `EvMenu.msg(txt)` added as a central place to send text to the user, makes it easier to override. Default `EvMenu.msg` sends with OOB type="menu" for use with OOB and webclient pane-redirects. - New EvMenu templating system for quickly building simpler EvMenus without as much code. -- Renamed Tutorial classes "Weapon" and "WeaponRack" to "TutorialWeapon" and - "TutorialWeaponRack" to prevent collisions with classes in mygame +- Add `Command.client_height()` method to match existing `.client_width` (stricako) +- Include more Web-client info in `session.protocol_flags`. ## Evennia 0.9 (2018-2019) diff --git a/evennia/server/portal/webclient.py b/evennia/server/portal/webclient.py index 6a70756c39..0f7f05f2e7 100644 --- a/evennia/server/portal/webclient.py +++ b/evennia/server/portal/webclient.py @@ -117,6 +117,10 @@ class WebSocketClient(WebSocketServerProtocol, _BASE_SESSION_CLASS): self.sessid = old_session.sessid self.sessionhandler.disconnect(old_session) + self.protocol_flags["CLIENTNAME"] = "Evennia Webclient (websocket)" + self.protocol_flags["UTF-8"] = True + self.protocol_flags["OOB"] = True + # watch for dead links self.transport.setTcpKeepAlive(1) # actually do the connection